fix: ensure variants are created for unique video codec bases #6835
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
|
Incremental code coverage: 100.00% |
avelad
added
type: bug
| @@ -734,6 +735,24 @@ shaka.util.PeriodCombiner = class { | |||
| used = false; | |||
| } | |||
| } | |||
| // In cases where we have the same video codec but different | |||
| // codec bases in matched representations across periods | |||
| // (e.g. HEVC as hev and hvc), we don't want to delete the matched stream | |||
There was a problem hiding this comment.
I might be misunderstanding, but it seems like the solution could be just to normalize video codecs in streams before processing periods and in configs before applying preferences. If they all said hev or all said hvc, problem solved, correct?
There was a problem hiding this comment.
That could work, but I think would still result in confusion in some cases, like we are finding with manifests returned from Google DAI.
For example, we have HEVC content encoded in a hvc format. When requesting a stitched manifest from DAI, with DAI pre-rolls and our original content, the HEVC pre-roll representations from DAI are encoding in a hev format. As a content owner, I know there are hvc representations in my manifest but may not know DAI has used a different format for pre-rolls. If Shaka Player "converts" hvc to hev, then when no hvc variants exist it's confusing as to why those aren't available.
Outside the scope of this change but related: In the same manifest we also have content encoded as dvhe. DAI does not encode ads in DVHE. Shaka Player matches the content period dvhe streams with the pre-roll hev streams. dvhe variants are still created even though DVHE streams aren't available in pre-rolls. For conformity with that behavior, I think it makes sense to create unique variants for each codec base.
@dsparacio Any additional thoughts here?
| // (e.g. HEVC as hev and hvc), we don't want to delete the matched stream | ||
| // from unusedStreamsPerPeriod until an outputStream for each | ||
| // video representation has been created. | ||
| if (outputStream.type == ContentType.VIDEO) { |
There was a problem hiding this comment.
We also want this when using different aac profiles, for example mp4a.40.2 for ads and mp4a.40.29 for main content.
There was a problem hiding this comment.
@avelad Do you think this should apply to all ContentType.AUDIO as well?
Resolves #6820.