From 33fd704cce4e66e27623dcab99d8f3cef02a991e Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 9 Jun 2022 20:34:42 +0200 Subject: Fixed openh264 decode --- mozilla-1663844.patch | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'mozilla-1663844.patch') diff --git a/mozilla-1663844.patch b/mozilla-1663844.patch index b8712e0..4cc43ea 100644 --- a/mozilla-1663844.patch +++ b/mozilla-1663844.patch @@ -1,6 +1,6 @@ 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 ++++ firefox-101.0.1/dom/media/gmp/GMPSharedMemManager.h 2022-06-09 17:17:04.775008085 +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 @@ -12,19 +12,20 @@ diff -up firefox-101.0.1/dom/media/gmp/GMPSharedMemManager.h.1663844 firefox-101 for (size_t i = 0; i < sizeof(mGmpAllocated) / sizeof(mGmpAllocated[0]); 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); ++++ firefox-101.0.1/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp 2022-06-09 20:31:25.120035588 +0200 +@@ -84,6 +84,9 @@ media::DecodeSupportSet GMPDecoderModule + + media::DecodeSupportSet GMPDecoderModule::SupportsMimeType( + const nsACString& aMimeType, DecoderDoctorDiagnostics* aDiagnostics) const { ++ if (MP4Decoder::IsH264(aMimeType)) { ++ return media::DecodeSupport::SoftwareDecode; ++ } + return media::DecodeSupport::Unsupported; + } - if (MP4Decoder::IsH264(aMimeType)) { -- isSupported = HaveGMPFor(api, {"h264"_ns, aGMP.value()}); -+ isSupported = true; - } else if (VPXDecoder::IsVP9(aMimeType)) { - 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 ++++ firefox-101.0.1/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp 2022-06-09 17:17:04.776008117 +0200 @@ -70,6 +70,8 @@ void GMPVideoDecoder::Decoded(GMPVideoi4 RefPtr self = this; if (v) { -- cgit