Repository navigation
stream: fix 8-channel AAC always-available tracks refusing 7.1 publishers - #6414
Merged
Merged
Conversation
…hers With an always-available MPEG4Audio track of channelCount 8, a 7.1 AAC publisher is refused with "MPEG-4 audio configuration does not match". The track uses channel configuration 8, which is reserved, while the publisher's configuration is 7. Channel configuration 7 stands for 8 channels. Use configuration 7 for an 8-channel track. Other channel counts are unchanged.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #6414 +/- ##
=======================================
Coverage 71.31% 71.31%
=======================================
Files 289 289
Lines 21968 21971 +3
=======================================
+ Hits 15666 15669 +3
Misses 6302 6302 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Member
|
merged, thanks |
Contributor
|
This issue is mentioned in release v1.21.3 🚀 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
An
alwaysAvailableTracksentry{codec: MPEG4Audio, sampleRate: 48000, channelCount: 8}refuses a 7.1 AAC publisher:MPEG-4 audio configuration does not match, is type=2, sampleRate=48000, channelCount=7, but stream expects type=2, sampleRate=48000, channelCount=8.mediasFromAlwaysAvailableTrackssets the track'sChannelConfigto the channel count (stream.go#L173-L188). Configuration 8 is reserved, and a 7.1 publisher's configuration is 7, so the two differ. The MoQ code had the same mapping and was fixed in #6406.Use configuration 7 for 8 channels, so that publisher is accepted. Other channel counts keep their result. An MPEG-TS recording of the offline 8-channel track gets ADTS channel configuration 7, not 0.
TestStreamAlwaysAvailableErrorsgets a row with an 8-channel track and a 7.1 publisher at another sample rate. The track side of its error now endschannelCount=7, notchannelCount=8. It fails three times without the fix and passes three times with it.