Closed Bug 1093318 Opened 5 years ago Closed 5 years ago

Pass newer AAC profile levels to the platform decoder module

Categories

(Core :: Audio/Video, defect)

x86
Windows 8.1
defect
Not set

Tracking

()

RESOLVED FIXED
mozilla36

People

(Reporter: rillian, Assigned: jya)

References

Details

Attachments

(1 file)

From bug 1073805 comment 50:

::: dom/media/fmp4/wmf/WMFAudioMFTManager.cpp
@@ +22,4 @@
>  namespace mozilla {
>  
>  static void
> +AACAudioSpecificConfigToUserData(uint8_t aAACProfileLevelIndication,

I just discovered that we actually don't need to pass that aAACProfileLevelIndication here. The demuxer only outputs aacProfileLevelIndication values in range [1..4]:
http://mxr.mozilla.org/mozilla-central/source/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp#2336

So the profileLevelIndication value for the file in question here (46 IIRC) will in fact be output as 0 by the demuxer.

So in practice we'll be passing aAACProfileLevelIndication==0 for the oddball types anyway. I think WMF is smart enough to figure it out based on the AudioSepcificConfig we pass in (the "user data"). We can prune this off in a follow up.
Depends on: 1073805
All the information we need should be contained in the mp4_demuxer::AudioDecoderConfig::audio_specific_config

Which is the Mpeg4's Audio Specific Config.
The AAC profile is encoded over the first 5 or 6 bits.

http://wiki.multimedia.cx/index.php?title=MPEG-4_Audio#Audio_Specific_Config
Assignee: nobody → jyavenard
Pass full extended profile. I didn't want to modify libstagefright itself, and keep backward compatibility, so both profiles are passed. aac_profile is limited to between 0-4, extended_profile contains the whole 6 bits
Attachment #8523565 - Flags: review?(edwin)
Blocks: 1096769
Keywords: checkin-needed
jya: do you have a try link handy ? thanks!
Flags: needinfo?(jyavenard)
Keywords: checkin-needed
https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=a24f719a3479

fairly confident that this change is localised enough
Flags: needinfo?(jyavenard)
Keywords: checkin-needed
https://hg.mozilla.org/mozilla-central/rev/6ae01e96281a
Status: NEW → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla36
You need to log in before you can comment on or make changes to this bug.