Add support for demuxing xhe-aac files #435
Open
Conversation
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
kinetiknz
approved these changes
Jul 9, 2025
| // Only set codec type if it hasn't been set to a more specific type (e.g., XHEAAC) | ||
| if esds.audio_codec == CodecType::Unknown { | ||
| esds.audio_codec = match object_profile { | ||
| 0x40 | 0x66 | 0x67 => CodecType::AAC, |
There was a problem hiding this comment.
It might be a tiny bit clearer to use:
0x40 if esds.audio_object_type == Some(42) => CodecType::XHEAAC,
to keep the initialization of audio_codec in a single location, but it doesn't matter too much.
| @@ -5118,7 +5119,7 @@ fn read_ds_descriptor( | |||
| }; | |||
|
|
|||
| match audio_object_type { | |||
| 1..=4 | 6 | 7 | 17 | 19..=23 => { | |||
| 1..=4 | 6 | 7 | 17 | 19..=23 | 42 => { | |||
There was a problem hiding this comment.
This seems to work for now (similar to Chromium's AAC parsing) but it looks like xHE-AAC uses UsacConfig rather than GASpecificConfig (ffmpeg handles them separately), so it'd be worth adding a comment highlighting that audio_object_type == 42 could need different handling in the future to avoid tripping ourselves up if the GASpecificConfig parsing is ever extended or made stricter or we need specific fields from the UsacConfig.
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.
Necessary to fix BMO#1711882