Bug 1315567: P1. Remove invalid test. r=gerald,a=gchang
authorJean-Yves Avenard <jyavenard@mozilla.com>
Mon, 07 Nov 2016 12:56:55 +1100
changeset 358732 eb7e5e61642b52c69c6b188ed87b4241fe086cf2
parent 358731 36f095d0dbfa344f551901b70437c88bee147e30
child 358733 c9ab0a2b4edfcc61731208fc07a13a229a863dbc
push id1324
push usermtabara@mozilla.com
push dateMon, 16 Jan 2017 13:07:44 +0000
treeherdermozilla-release@a01c49833940 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerald, gchang
bugs1315567
milestone51.0a2
Bug 1315567: P1. Remove invalid test. r=gerald,a=gchang audio/opus is a codec type, not a MP4 container one. aMIMETypeExcludingCodecs can never be audio/opus. Backport from Firefox 52 to Firefox 51. MozReview-Commit-ID: E8tONlF4COA
dom/media/fmp4/MP4Decoder.cpp
--- a/dom/media/fmp4/MP4Decoder.cpp
+++ b/dom/media/fmp4/MP4Decoder.cpp
@@ -86,33 +86,32 @@ MP4Decoder::CanHandleMediaType(const nsA
   if (!IsEnabled()) {
     return false;
   }
 
   // Whitelist MP4 types, so they explicitly match what we encounter on
   // the web, as opposed to what we use internally (i.e. what our demuxers
   // etc output).
   const bool isMP4Audio = aMIMETypeExcludingCodecs.EqualsASCII("audio/mp4") ||
-                          aMIMETypeExcludingCodecs.EqualsASCII("audio/x-m4a") ||
-                          aMIMETypeExcludingCodecs.EqualsASCII("audio/opus");
+                          aMIMETypeExcludingCodecs.EqualsASCII("audio/x-m4a");
   const bool isMP4Video =
   // On B2G, treat 3GPP as MP4 when Gonk PDM is available.
 #ifdef MOZ_GONK_MEDIACODEC
     aMIMETypeExcludingCodecs.EqualsASCII(VIDEO_3GPP) ||
 #endif
     aMIMETypeExcludingCodecs.EqualsASCII("video/mp4") ||
     aMIMETypeExcludingCodecs.EqualsASCII("video/quicktime") ||
     aMIMETypeExcludingCodecs.EqualsASCII("video/x-m4v");
   if (!isMP4Audio && !isMP4Video) {
     return false;
   }
 
   nsTArray<nsCString> codecMimes;
   if (aCodecs.IsEmpty()) {
-    // No codecs specified. Assume AAC/H.264
+    // No codecs specified. Assume H.264
     if (isMP4Audio) {
       codecMimes.AppendElement(NS_LITERAL_CSTRING("audio/mp4a-latm"));
     } else {
       MOZ_ASSERT(isMP4Video);
       codecMimes.AppendElement(NS_LITERAL_CSTRING("video/avc"));
     }
   } else {
     // Verify that all the codecs specified are ones that we expect that