Bug 1232514 - Make GMPDecryptsAndDecodesH264() actually check for H.264 rather than AAC. r=jwwang a=ritu
authorChris Pearce <cpearce@mozilla.com>
Tue, 15 Dec 2015 14:07:01 +1300
changeset 310496 cb7fd3c17a75bad2427588a9bc04d2f6960e75c1
parent 310495 8fffb73940213a6b5b14d2cb9e7f49857eea7d6c
child 310497 586fe84e48ca9f914880e5fdbf3dbdae1e82b5e7
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjwwang, ritu
bugs1232514
milestone45.0a2
Bug 1232514 - Make GMPDecryptsAndDecodesH264() actually check for H.264 rather than AAC. r=jwwang a=ritu
dom/media/eme/MediaKeySystemAccess.cpp
--- a/dom/media/eme/MediaKeySystemAccess.cpp
+++ b/dom/media/eme/MediaKeySystemAccess.cpp
@@ -323,18 +323,18 @@ static bool
 GMPDecryptsAndDecodesH264(mozIGeckoMediaPluginService* aGMPS,
                           const nsAString& aKeySystem)
 {
   MOZ_ASSERT(HaveGMPFor(aGMPS,
                         NS_ConvertUTF16toUTF8(aKeySystem),
                         NS_LITERAL_CSTRING(GMP_API_DECRYPTOR)));
   return HaveGMPFor(aGMPS,
                     NS_ConvertUTF16toUTF8(aKeySystem),
-                    NS_LITERAL_CSTRING(GMP_API_AUDIO_DECODER),
-                    NS_LITERAL_CSTRING("aac"));
+                    NS_LITERAL_CSTRING(GMP_API_VIDEO_DECODER),
+                    NS_LITERAL_CSTRING("h264"));
 }
 
 // If this keysystem's CDM explicitly says it doesn't support decoding,
 // that means it's OK with passing the decrypted samples back to Gecko
 // for decoding. Note we special case Clearkey on Windows, where we need
 // to check for whether WMF is usable because the CDM uses that
 // to decode.
 static bool