From 70498d2115b4ca8f589cd07d9f9c12fdce80d014 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Thu, 8 Oct 2015 20:40:09 +1300
Subject: [PATCH] Bug 1211812 - Add pref to select GMP to use for unencrypted
 decoding. r=jwwang

---
 browser/app/profile/firefox.js                |  5 +++
 dom/media/platforms/PDMFactory.cpp            |  1 +
 .../agnostic/eme/EMEAudioDecoder.cpp          |  2 +-
 .../agnostic/eme/EMEVideoDecoder.cpp          |  2 +-
 .../agnostic/gmp/GMPAudioDecoder.cpp          |  6 +++
 .../agnostic/gmp/GMPDecoderModule.cpp         | 38 +++++++++++++++++++
 .../platforms/agnostic/gmp/GMPDecoderModule.h |  6 +++
 .../agnostic/gmp/GMPVideoDecoder.cpp          |  6 +++
 modules/libpref/init/all.js                   |  2 +
 9 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index da322f58c9a3..072fe22937c9 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1825,6 +1825,11 @@ pref("ui.key.menuAccessKeyFocuses", true);
 pref("media.eme.enabled", true);
 pref("media.eme.apiVisible", true);
 
+// If decoding-via-gmp is turned on for <video>, default to using
+// Adobe's GMP for decoding.
+pref("media.fragmented-mp4.gmp.aac", 2);
+pref("media.fragmented-mp4.gmp.h264", 2);
+
 // Whether we should run a test-pattern through EME GMPs before assuming they'll
 // decode H.264.
 pref("media.gmp.trial-create.enabled", true);
diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp
index 450f8f521222..95c3d925231f 100644
--- a/dom/media/platforms/PDMFactory.cpp
+++ b/dom/media/platforms/PDMFactory.cpp
@@ -96,6 +96,7 @@ PDMFactory::Init()
 #ifdef MOZ_FFMPEG
   FFmpegRuntimeLinker::Link();
 #endif
+  GMPDecoderModule::Init();
 }
 
 PDMFactory::PDMFactory()
diff --git a/dom/media/platforms/agnostic/eme/EMEAudioDecoder.cpp b/dom/media/platforms/agnostic/eme/EMEAudioDecoder.cpp
index 5bd85f8b3588..5de4f8177358 100644
--- a/dom/media/platforms/agnostic/eme/EMEAudioDecoder.cpp
+++ b/dom/media/platforms/agnostic/eme/EMEAudioDecoder.cpp
@@ -24,7 +24,7 @@ EMEAudioCallbackAdapter::Error(GMPErr aErr)
 void
 EMEAudioDecoder::InitTags(nsTArray<nsCString>& aTags)
 {
-  GMPAudioDecoder::InitTags(aTags);
+  aTags.AppendElement(NS_LITERAL_CSTRING("aac"));
   aTags.AppendElement(NS_ConvertUTF16toUTF8(mProxy->KeySystem()));
 }
 
diff --git a/dom/media/platforms/agnostic/eme/EMEVideoDecoder.cpp b/dom/media/platforms/agnostic/eme/EMEVideoDecoder.cpp
index 0c2d56cd53e8..1541bf118e21 100644
--- a/dom/media/platforms/agnostic/eme/EMEVideoDecoder.cpp
+++ b/dom/media/platforms/agnostic/eme/EMEVideoDecoder.cpp
@@ -26,7 +26,7 @@ EMEVideoCallbackAdapter::Error(GMPErr aErr)
 void
 EMEVideoDecoder::InitTags(nsTArray<nsCString>& aTags)
 {
-  GMPVideoDecoder::InitTags(aTags);
+  aTags.AppendElement(NS_LITERAL_CSTRING("h264"));
   aTags.AppendElement(NS_ConvertUTF16toUTF8(mProxy->KeySystem()));
 }
 
diff --git a/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp b/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp
index e028f25bff10..ce8a96a9d499 100644
--- a/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp
+++ b/dom/media/platforms/agnostic/gmp/GMPAudioDecoder.cpp
@@ -7,6 +7,7 @@
 #include "GMPAudioDecoder.h"
 #include "nsServiceManagerUtils.h"
 #include "MediaInfo.h"
+#include "GMPDecoderModule.h"
 
 namespace mozilla {
 
@@ -125,6 +126,11 @@ void
 GMPAudioDecoder::InitTags(nsTArray<nsCString>& aTags)
 {
   aTags.AppendElement(NS_LITERAL_CSTRING("aac"));
+  const Maybe<nsCString> gmp(
+    GMPDecoderModule::PreferredGMP(NS_LITERAL_CSTRING("audio/mp4a-latm")));
+  if (gmp.isSome()) {
+    aTags.AppendElement(gmp.value());
+  }
 }
 
 nsCString
diff --git a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
index b38b2755a740..37726bf58b28 100644
--- a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
+++ b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
@@ -10,6 +10,7 @@
 #include "MediaDataDecoderProxy.h"
 #include "mozIGeckoMediaPluginService.h"
 #include "nsServiceManagerUtils.h"
+#include "mozilla/Preferences.h"
 
 namespace mozilla {
 
@@ -86,4 +87,41 @@ GMPDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
   }
 }
 
+static uint32_t sPreferredAacGmp = 0;
+static uint32_t sPreferredH264Gmp = 0;
+
+/* static */
+void
+GMPDecoderModule::Init()
+{
+  Preferences::AddUintVarCache(&sPreferredAacGmp,
+                               "media.fragmented-mp4.gmp.aac", 0);
+  Preferences::AddUintVarCache(&sPreferredH264Gmp,
+                               "media.fragmented-mp4.gmp.h264", 0);
+}
+
+/* static */
+const Maybe<nsCString>
+GMPDecoderModule::PreferredGMP(const nsACString& aMimeType)
+{
+  Maybe<nsCString> rv;
+  if (aMimeType.EqualsLiteral("audio/mp4a-latm")) {
+    switch (sPreferredAacGmp) {
+      case 1: rv.emplace(NS_LITERAL_CSTRING("org.w3.clearkey")); break;
+      case 2: rv.emplace(NS_LITERAL_CSTRING("com.adobe.primetime")); break;
+      default: break;
+    }
+  }
+
+  if (aMimeType.EqualsLiteral("video/avc")) {
+    switch (sPreferredH264Gmp) {
+      case 1: rv.emplace(NS_LITERAL_CSTRING("org.w3.clearkey")); break;
+      case 2: rv.emplace(NS_LITERAL_CSTRING("com.adobe.primetime")); break;
+      default: break;
+    }
+  }
+
+  return rv;
+}
+
 } // namespace mozilla
diff --git a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.h b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.h
index 1a60997c96cc..656bf1033b6c 100644
--- a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.h
+++ b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.h
@@ -8,6 +8,7 @@
 #define GMPDecoderModule_h_
 
 #include "PlatformDecoderModule.h"
+#include "mozilla/Maybe.h"
 
 namespace mozilla {
 
@@ -41,6 +42,11 @@ public:
     return aMimeType.EqualsLiteral("audio/mp4a-latm") ||
       aMimeType.EqualsLiteral("video/avc");
   }
+
+  static void Init();
+
+  static const Maybe<nsCString> PreferredGMP(const nsACString& aMimeType);
+
 };
 
 } // namespace mozilla
diff --git a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
index 9c5ebcab7986..63f3913435d2 100644
--- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
+++ b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
@@ -9,6 +9,7 @@
 #include "mozilla/Endian.h"
 #include "prsystem.h"
 #include "MediaData.h"
+#include "GMPDecoderModule.h"
 
 namespace mozilla {
 
@@ -107,6 +108,11 @@ void
 GMPVideoDecoder::InitTags(nsTArray<nsCString>& aTags)
 {
   aTags.AppendElement(NS_LITERAL_CSTRING("h264"));
+  const Maybe<nsCString> gmp(
+    GMPDecoderModule::PreferredGMP(NS_LITERAL_CSTRING("video/avc")));
+  if (gmp.isSome()) {
+    aTags.AppendElement(gmp.value());
+  }
 }
 
 nsCString
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 3384433c6d4e..e2108d0fe33e 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -322,6 +322,8 @@ pref("media.directshow.enabled", true);
 pref("media.fragmented-mp4.enabled", true);
 pref("media.fragmented-mp4.ffmpeg.enabled", false);
 pref("media.fragmented-mp4.gmp.enabled", false);
+pref("media.fragmented-mp4.gmp.aac", 0);
+pref("media.fragmented-mp4.gmp.h264", 0);
 // Specifies whether the fragmented MP4 parser uses a test decoder that
 // just outputs blank frames/audio instead of actually decoding. The blank
 // decoder works on all platforms.