7d7726
diff -up firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-99.0/dom/media/mp4/MP4Demuxer.cpp
7d7726
--- firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333	2022-03-31 01:24:44.000000000 +0200
7d7726
+++ firefox-99.0/dom/media/mp4/MP4Demuxer.cpp	2022-04-04 09:58:35.606351546 +0200
7d7726
@@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { re
7d7726
   DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
7d7726
             __func__, ##__VA_ARGS__)
7d7726
 
7d7726
+extern bool gUseKeyframeFromContainer;
7d7726
+
7d7726
 namespace mozilla {
7d7726
 
7d7726
 DDLoggedTypeDeclNameAndBase(MP4TrackDemuxer, MediaTrackDemuxer);
7d7726
@@ -394,6 +396,12 @@ already_AddRefed<MediaRawData> MP4TrackD
7d7726
           [[fallthrough]];
7d7726
         case H264::FrameType::OTHER: {
7d7726
           bool keyframe = type == H264::FrameType::I_FRAME;
7d7726
+          if (gUseKeyframeFromContainer) {
7d7726
+            if (sample->mKeyframe && sample->mKeyframe != keyframe) {
7d7726
+              sample->mKeyframe = keyframe;
7d7726
+            }
7d7726
+            break;
7d7726
+          }
7d7726
           if (sample->mKeyframe != keyframe) {
7d7726
             NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
7d7726
                                        "@ pts:%" PRId64 " dur:%" PRId64
7d7726
diff -up firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-99.0/dom/media/platforms/PDMFactory.cpp
7d7726
--- firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333	2022-03-31 01:24:44.000000000 +0200
7d7726
+++ firefox-99.0/dom/media/platforms/PDMFactory.cpp	2022-04-04 10:09:57.383419125 +0200
7d7726
@@ -58,6 +58,8 @@
7d7726
 
7d7726
 #include <functional>
7d7726
 
7d7726
+bool gUseKeyframeFromContainer = false;
7d7726
+
7d7726
 namespace mozilla {
7d7726
 
7d7726
 #define PDM_INIT_LOG(msg, ...) \
7d7726
@@ -495,7 +497,7 @@ void PDMFactory::CreateRddPDMs() {
7d7726
 #ifdef MOZ_FFMPEG
7d7726
   if (StaticPrefs::media_ffmpeg_enabled() &&
7d7726
       StaticPrefs::media_rdd_ffmpeg_enabled() &&
7d7726
-      !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
7d7726
+      !(mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>())) {
7d7726
     mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
7d7726
         FFmpegRuntimeLinker::LinkStatusCode());
7d7726
   }
7d7726
@@ -602,8 +604,9 @@ void PDMFactory::CreateDefaultPDMs() {
7d7726
 
7d7726
   CreateAndStartupPDM<AgnosticDecoderModule>();
7d7726
 
7d7726
-  if (StaticPrefs::media_gmp_decoder_enabled() &&
7d7726
+  if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
7d7726
       !CreateAndStartupPDM<GMPDecoderModule>()) {
7d7726
+    gUseKeyframeFromContainer = true;
7d7726
     mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
7d7726
   }
7d7726
 }
7d7726
diff -up firefox-99.0/dom/media/platforms/PDMFactory.h.1670333 firefox-99.0/dom/media/platforms/PDMFactory.h
7d7726
--- firefox-99.0/dom/media/platforms/PDMFactory.h.1670333	2022-03-31 01:24:44.000000000 +0200
7d7726
+++ firefox-99.0/dom/media/platforms/PDMFactory.h	2022-04-04 09:58:35.606351546 +0200
7d7726
@@ -121,6 +121,7 @@ class PDMFactory final {
7d7726
   RefPtr<PlatformDecoderModule> mNullPDM;
7d7726
 
7d7726
   DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
7d7726
+  bool mFFmpegUsed = false;
7d7726
 
7d7726
   friend class RemoteVideoDecoderParent;
7d7726
   static void EnsureInit();