Bug 1151360: Allow playback of extended AAC profile audio track. r=k17e
authorJean-Yves Avenard <jyavenard@mozilla.com>
Tue, 07 Apr 2015 20:33:17 +1000
changeset 267748 aa2fa3cb933ba1225bf5d47c05a40fbf699d692e
parent 267747 86efbe39200abbc6c3c26b6f8435ceeff5ebd6dc
child 267749 8d4f2e3618b797c3a9e7b590ec2b85937d882262
push id4830
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:18:48 +0000
treeherdermozilla-beta@4c2175bb0420 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersk17e
bugs1151360
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1151360: Allow playback of extended AAC profile audio track. r=k17e
media/libstagefright/binding/DecoderData.cpp
--- a/media/libstagefright/binding/DecoderData.cpp
+++ b/media/libstagefright/binding/DecoderData.cpp
@@ -170,17 +170,18 @@ AudioDecoderConfig::Update(sp<MetaData>&
     }
   }
 }
 
 bool
 AudioDecoderConfig::IsValid()
 {
   return channel_count > 0 && samples_per_second > 0 && frequency_index > 0 &&
-         (!mime_type.Equals(MEDIA_MIMETYPE_AUDIO_AAC) || aac_profile > 0);
+         (!mime_type.Equals(MEDIA_MIMETYPE_AUDIO_AAC) ||
+          aac_profile > 0 || extended_profile > 0);
 }
 
 void
 VideoDecoderConfig::Update(sp<MetaData>& aMetaData, const char* aMimeType)
 {
   TrackConfig::Update(aMetaData, aMimeType);
   display_width = FindInt32(aMetaData, kKeyDisplayWidth);
   display_height = FindInt32(aMetaData, kKeyDisplayHeight);