mozilla-central: changeset 254075:7b53eecbea83b3e031b34b4c10913f4ab735dbcf

author	Jean-Yves Avenard <jyavenard@mozilla.com>
	Tue, 21 Jul 2015 19:41:10 +1000
changeset 254075	7b53eecbea83b3e031b34b4c10913f4ab735dbcf
parent 254074	d9ff60294bcd52811f993bf01c93664bc73329b9
child 254076	de0a5cf8c4f9ceb62c0f17039f66f177eac3631e
push id	29087
push user	cbook@mozilla.com
push date	Wed, 22 Jul 2015 12:01:23 +0000
treeherder	mozilla-central@e7434cafdf2f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	cpearce
bugs	1184826
milestone	42.0a1
first release with	nightly linux32 1f77b78797d6 / 42.0a1 / 20150723030207 / files nightly linux64 1f77b78797d6 / 42.0a1 / 20150723030207 / files nightly mac 1f77b78797d6 / 42.0a1 / 20150723030207 / files nightly win32 1f77b78797d6 / 42.0a1 / 20150723030207 / files nightly win64 1f77b78797d6 / 42.0a1 / 20150723030207 / files
last release without	nightly linux32 8e5c888d0d89 / 42.0a1 / 20150722030205 / files nightly linux64 8e5c888d0d89 / 42.0a1 / 20150722030205 / files nightly mac 8e5c888d0d89 / 42.0a1 / 20150722030205 / files nightly win32 8e5c888d0d89 / 42.0a1 / 20150722030205 / files nightly win64 8e5c888d0d89 / 42.0a1 / 20150722030205 / files

--- a/dom/media/fmp4/MP4Decoder.cpp
+++ b/dom/media/fmp4/MP4Decoder.cpp
@@ -66,18 +66,19 @@ MP4Decoder::SetCDMProxy(CDMProxy* aProxy
 #endif
 
 static bool
 IsSupportedAudioCodec(const nsAString& aCodec,
                       bool& aOutContainsAAC,
                       bool& aOutContainsMP3)
 {
   // AAC-LC or HE-AAC in M4A.
-  aOutContainsAAC = aCodec.EqualsASCII("mp4a.40.2") ||
-                    aCodec.EqualsASCII("mp4a.40.5");
+  aOutContainsAAC = aCodec.EqualsASCII("mp4a.40.2")     // MPEG4 AAC-LC
+                    || aCodec.EqualsASCII("mp4a.40.5")  // MPEG4 HE-AAC
+                    || aCodec.EqualsASCII("mp4a.67");   // MPEG2 AAC-LC
   if (aOutContainsAAC) {
     return true;
   }
 #ifndef MOZ_GONK_MEDIACODEC // B2G doesn't support MP3 in MP4 yet.
   aOutContainsMP3 = aCodec.EqualsASCII("mp3");
   if (aOutContainsMP3) {
     return true;
   }