fix: Fix multi-period DASH with descriptive audio #4629
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…mbination with description audio tracks
littlespex
commented
Oct 27, 2022
Comment on lines
-1183
to
-1191
| // If the language doesn't match, but the candidate is the "primary" | ||
| // language, then that should be preferred as a fallback. | ||
| if (!best.primary && candidate.primary) { | ||
| return true; | ||
| } | ||
| if (best.primary && !candidate.primary) { | ||
| return false; | ||
| } | ||
|
|
There was a problem hiding this comment.
@joeyparrish Removing this completely caused a number of issues, but moving it below the role check solves the issue.
avelad
added
type: bug
littlespex
commented
Oct 27, 2022
| @@ -1141,14 +1149,163 @@ describe('PeriodCombiner', () => { | |||
| expect(audio2.originalId).toBe('stream2,stream4'); | |||
| }); | |||
|
|
|||
| it('Matches streams with roles in common', async () => { | |||
There was a problem hiding this comment.
This test simulates the stream that originally manifested the issue. It is a multi-period steam where all periods have the same number of video and audio adaptation sets, and the audio adaptations both have roles, one main and one description.
| expect(audio4.originalId).toBe('stream2,stream2'); | ||
| }); | ||
|
|
||
| it('Matches streams with mismatched roles', async () => { |
There was a problem hiding this comment.
This test simulates a similar stream to the one above, but this time with periods representing pre-roll and mid-roll ads that only have main audio tracks.
|
Incremental code coverage: 100.00% |
joeyparrish
requested changes
Oct 27, 2022
test/util/periods_unit.js
Outdated
Comment on lines
1278
to
1281
| makeAVVariant(720, 'en'), | ||
| makeAVVariant(1080, 'en'), | ||
| makeAVVariant(720, 'en'), | ||
| makeAVVariant(1080, 'en'), |
There was a problem hiding this comment.
Could you add an optional roles argument to makeAVVariant? I think this part of the test would be clearer if we could see the expected roles here.
|
This looks great overall. I'm excited to include it in the bugfix releases I've been preparing. |
joeyparrish
approved these changes
Oct 27, 2022
joeyparrish
changed the title
avelad
approved these changes
Oct 28, 2022
joeyparrish
pushed a commit
that referenced
this pull request
Oct 28, 2022
Perform the `primary` check after `role` check to improve period flattening on streams with both `main` and `description` audio tracks. Resolves #4500 Co-authored-by: Dan Sparacio <daniel.sparacio@cbsinteractive.com>
joeyparrish
pushed a commit
that referenced
this pull request
Oct 28, 2022
Perform the `primary` check after `role` check to improve period flattening on streams with both `main` and `description` audio tracks. Resolves #4500 Co-authored-by: Dan Sparacio <daniel.sparacio@cbsinteractive.com>
joeyparrish
pushed a commit
that referenced
this pull request
Oct 28, 2022
Perform the `primary` check after `role` check to improve period flattening on streams with both `main` and `description` audio tracks. Resolves #4500 Co-authored-by: Dan Sparacio <daniel.sparacio@cbsinteractive.com>
joeyparrish
pushed a commit
that referenced
this pull request
Oct 28, 2022
Perform the `primary` check after `role` check to improve period flattening on streams with both `main` and `description` audio tracks. Resolves #4500 Co-authored-by: Dan Sparacio <daniel.sparacio@cbsinteractive.com>
joeyparrish
pushed a commit
that referenced
this pull request
Oct 29, 2022
Perform the `primary` check after `role` check to improve period flattening on streams with both `main` and `description` audio tracks. Resolves #4500 Co-authored-by: Dan Sparacio <daniel.sparacio@cbsinteractive.com>
joeyparrish
pushed a commit
that referenced
this pull request
Oct 29, 2022
Perform the `primary` check after `role` check to improve period flattening on streams with both `main` and `description` audio tracks. Resolves #4500 Co-authored-by: Dan Sparacio <daniel.sparacio@cbsinteractive.com>
github-actions
bot
added
the
status: archived
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Perform the
primarycheck afterrolecheck to improve period flattening on streams with bothmainanddescriptionaudio tracks.Resolves #4500