From e2a4b7e32db3b6700dccfb76f68e442a72a935f7 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Jun 09 2022 15:21:56 +0000
Subject: Adjust GMP plugin setting (rhbz#2094319)


---

diff --git a/firefox.spec b/firefox.spec
index 0673ea6..70246c1 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1111,6 +1111,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Thu Jun 9 2022 Martin Stransky <stransky@redhat.com>- 101.0.1-1
 - Updated to 101.0.1
 - More VA-API sandbox fixes (mzbz#1769182)
+- Adjust GMP plugin setting (rhbz#2094319)
 
 * Tue Jun 7 2022 Martin Stransky <stransky@redhat.com>- 101.0-2
 - Enabled VA-API by default (+ added VA-API fixes from upstream)
diff --git a/mozilla-1663844.patch b/mozilla-1663844.patch
index d356425..b8712e0 100644
--- a/mozilla-1663844.patch
+++ b/mozilla-1663844.patch
@@ -1,6 +1,6 @@
-diff -up firefox-101.0/dom/media/gmp/GMPSharedMemManager.h.1663844 firefox-101.0/dom/media/gmp/GMPSharedMemManager.h
---- firefox-101.0/dom/media/gmp/GMPSharedMemManager.h.1663844	2022-05-27 01:16:53.000000000 +0200
-+++ firefox-101.0/dom/media/gmp/GMPSharedMemManager.h	2022-05-30 21:15:20.989993419 +0200
+diff -up firefox-101.0.1/dom/media/gmp/GMPSharedMemManager.h.1663844 firefox-101.0.1/dom/media/gmp/GMPSharedMemManager.h
+--- firefox-101.0.1/dom/media/gmp/GMPSharedMemManager.h.1663844	2022-06-08 23:06:36.000000000 +0200
++++ firefox-101.0.1/dom/media/gmp/GMPSharedMemManager.h	2022-06-09 16:45:32.341742564 +0200
 @@ -27,7 +27,7 @@ class GMPSharedMem {
    // returned to the parent pool (which is not included).  If more than
    // this are needed, we presume the client has either crashed or hung
@@ -10,20 +10,21 @@ diff -up firefox-101.0/dom/media/gmp/GMPSharedMemManager.h.1663844 firefox-101.0
  
    GMPSharedMem() {
      for (size_t i = 0; i < sizeof(mGmpAllocated) / sizeof(mGmpAllocated[0]);
-diff -up firefox-101.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp.1663844 firefox-101.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
---- firefox-101.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp.1663844	2022-05-30 21:15:20.989993419 +0200
-+++ firefox-101.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp	2022-05-30 21:24:16.615282035 +0200
-@@ -66,6 +66,7 @@ media::DecodeSupportSet GMPDecoderModule
- 
+diff -up firefox-101.0.1/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp.1663844 firefox-101.0.1/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
+--- firefox-101.0.1/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp.1663844	2022-06-08 16:10:21.000000000 +0200
++++ firefox-101.0.1/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp	2022-06-09 17:14:51.310699618 +0200
+@@ -67,7 +67,7 @@ media::DecodeSupportSet GMPDecoderModule
    nsCString api = nsLiteralCString(CHROMIUM_CDM_API);
  
-+  // TODO: Do we enable it here?
    if (MP4Decoder::IsH264(aMimeType)) {
-     isSupported = HaveGMPFor(api, {"h264"_ns, aGMP.value()});
+-    isSupported = HaveGMPFor(api, {"h264"_ns, aGMP.value()});
++    isSupported = true;
    } else if (VPXDecoder::IsVP9(aMimeType)) {
-diff -up firefox-101.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp.1663844 firefox-101.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
---- firefox-101.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp.1663844	2022-05-27 01:16:53.000000000 +0200
-+++ firefox-101.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp	2022-05-30 21:15:20.989993419 +0200
+     isSupported = HaveGMPFor(api, {"vp9"_ns, aGMP.value()});
+   } else if (VPXDecoder::IsVP8(aMimeType)) {
+diff -up firefox-101.0.1/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp.1663844 firefox-101.0.1/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
+--- firefox-101.0.1/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp.1663844	2022-06-08 16:10:21.000000000 +0200
++++ firefox-101.0.1/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp	2022-06-09 16:45:32.341742564 +0200
 @@ -70,6 +70,8 @@ void GMPVideoDecoder::Decoded(GMPVideoi4
    RefPtr<GMPVideoDecoder> self = this;
    if (v) {