Bug 1153895 - Support audio AMR-WB for Gonk in MP4Reader. r=jya
authorBlake Wu <bwu@mozilla.com>
Mon, 04 May 2015 10:11:29 +0800
changeset 242261 7bcd2168ad8734e900f11e4730ec8da111825c17
parent 242260 94eb248b77b008cb052750c136f8acd7f77e83f4
child 242262 995db217fd1b4a32daa4300195818bdafc78a64d
push id28686
push userryanvm@gmail.com
push dateMon, 04 May 2015 20:06:04 +0000
treeherdermozilla-central@102d0e9aa9e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya
bugs1153895
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 1153895 - Support audio AMR-WB for Gonk in MP4Reader. r=jya
dom/media/fmp4/MP4Reader.cpp
dom/media/fmp4/gonk/GonkDecoderModule.cpp
--- a/dom/media/fmp4/MP4Reader.cpp
+++ b/dom/media/fmp4/MP4Reader.cpp
@@ -369,16 +369,17 @@ MP4Reader::ExtractCryptoInitData(nsTArra
   }
 }
 
 bool
 MP4Reader::IsSupportedAudioMimeType(const nsACString& aMimeType)
 {
   return (aMimeType.EqualsLiteral("audio/mpeg") ||
           aMimeType.EqualsLiteral("audio/mp4a-latm") ||
+          aMimeType.EqualsLiteral("audio/amr-wb") ||
           aMimeType.EqualsLiteral("audio/3gpp")) &&
          mPlatform->SupportsMimeType(aMimeType);
 }
 
 bool
 MP4Reader::IsSupportedVideoMimeType(const nsACString& aMimeType)
 {
   return (aMimeType.EqualsLiteral("video/mp4") ||
--- a/dom/media/fmp4/gonk/GonkDecoderModule.cpp
+++ b/dom/media/fmp4/gonk/GonkDecoderModule.cpp
@@ -61,13 +61,14 @@ GonkDecoderModule::DecoderNeedsConversio
   }
 }
 
 bool
 GonkDecoderModule::SupportsMimeType(const nsACString& aMimeType)
 {
   return aMimeType.EqualsLiteral("audio/mp4a-latm") ||
     aMimeType.EqualsLiteral("audio/3gpp") ||
+    aMimeType.EqualsLiteral("audio/amr-wb") ||
     aMimeType.EqualsLiteral("video/mp4") ||
     aMimeType.EqualsLiteral("video/mp4v-es") ||
     aMimeType.EqualsLiteral("video/avc");
 }
 } // namespace mozilla