From c78ce968a861d6bbed272367b1ed8685a4a39795 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 20 Apr 2021 09:11:49 +0200
Subject: Updated to 88.0

---
 mozilla-1670333.patch | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'mozilla-1670333.patch')

diff --git a/mozilla-1670333.patch b/mozilla-1670333.patch
index b85b1a8..19e64c0 100644
--- a/mozilla-1670333.patch
+++ b/mozilla-1670333.patch
@@ -1,6 +1,6 @@
-diff -up firefox-87.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-87.0/dom/media/mp4/MP4Demuxer.cpp
---- firefox-87.0/dom/media/mp4/MP4Demuxer.cpp.1670333	2021-03-18 14:48:35.000000000 +0100
-+++ firefox-87.0/dom/media/mp4/MP4Demuxer.cpp	2021-03-22 20:05:43.862198652 +0100
+diff -up firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-88.0/dom/media/mp4/MP4Demuxer.cpp
+--- firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333	2021-04-15 21:44:28.000000000 +0200
++++ firefox-88.0/dom/media/mp4/MP4Demuxer.cpp	2021-04-19 13:36:44.101762211 +0200
 @@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { re
    DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
              __func__, ##__VA_ARGS__)
@@ -23,9 +23,9 @@ diff -up firefox-87.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-87.0/dom/medi
            if (sample->mKeyframe != keyframe) {
              NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
                                         "@ pts:%" PRId64 " dur:%" PRId64
-diff -up firefox-87.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-87.0/dom/media/platforms/PDMFactory.cpp
---- firefox-87.0/dom/media/platforms/PDMFactory.cpp.1670333	2021-03-18 14:48:35.000000000 +0100
-+++ firefox-87.0/dom/media/platforms/PDMFactory.cpp	2021-03-22 20:08:35.850255636 +0100
+diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-88.0/dom/media/platforms/PDMFactory.cpp
+--- firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333	2021-04-19 13:36:44.087761790 +0200
++++ firefox-88.0/dom/media/platforms/PDMFactory.cpp	2021-04-19 13:39:52.676433734 +0200
 @@ -58,6 +58,8 @@
  
  #include <functional>
@@ -35,22 +35,22 @@ diff -up firefox-87.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-87.0/do
  namespace mozilla {
  
  #define PDM_INIT_LOG(msg, ...) \
-@@ -558,9 +560,11 @@ void PDMFactory::CreateDefaultPDMs() {
+@@ -572,10 +574,10 @@ void PDMFactory::CreateDefaultPDMs() {
    }
  #endif
  #ifdef MOZ_FFMPEG
 -  if (StaticPrefs::media_ffmpeg_enabled() &&
 -      !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
--    mFailureFlags += DecoderDoctorDiagnostics::Flags::FFmpegFailedToLoad;
+-    mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
+-        FFmpegRuntimeLinker::LinkStatusCode());
 +  if (StaticPrefs::media_ffmpeg_enabled()) {
 +    mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>();
 +    if (!mFFmpegUsed) {
-+      mFailureFlags += DecoderDoctorDiagnostics::Flags::FFmpegFailedToLoad;
-+    }
++      mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(FFmpegRuntimeLinker::LinkStatusCode()); }
    }
  #endif
- #ifdef MOZ_WIDGET_ANDROID
-@@ -572,8 +576,9 @@ void PDMFactory::CreateDefaultPDMs() {
+ #ifdef MOZ_FFVPX
+@@ -592,8 +594,9 @@ void PDMFactory::CreateDefaultPDMs() {
  
    CreateAndStartupPDM<AgnosticDecoderModule>();
  
@@ -61,10 +61,10 @@ diff -up firefox-87.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-87.0/do
      mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
    }
  }
-diff -up firefox-87.0/dom/media/platforms/PDMFactory.h.1670333 firefox-87.0/dom/media/platforms/PDMFactory.h
---- firefox-87.0/dom/media/platforms/PDMFactory.h.1670333	2021-03-22 20:05:43.862198652 +0100
-+++ firefox-87.0/dom/media/platforms/PDMFactory.h	2021-03-22 20:08:17.705722130 +0100
-@@ -120,6 +120,7 @@ class PDMFactory final {
+diff -up firefox-88.0/dom/media/platforms/PDMFactory.h.1670333 firefox-88.0/dom/media/platforms/PDMFactory.h
+--- firefox-88.0/dom/media/platforms/PDMFactory.h.1670333	2021-04-15 21:44:28.000000000 +0200
++++ firefox-88.0/dom/media/platforms/PDMFactory.h	2021-04-19 13:36:44.101762211 +0200
+@@ -121,6 +121,7 @@ class PDMFactory final {
    RefPtr<PlatformDecoderModule> mNullPDM;
  
    DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
-- 
cgit