From 8b9e60f6058b408f87e01d695fa0c89a6c7fb996 Mon Sep 17 00:00:00 2001
From: Narcis Beleuzu <nbeleuzu@mozilla.com>
Date: Tue, 20 Nov 2018 21:13:48 +0200
Subject: [PATCH] Backed out 2 changesets (bug 1505284) for GTest crashes on [@
 mozilla::AppleDecoderModule::Init()] . CLOSED TREE

Backed out changeset 1d3eb26cfeac (bug 1505284)
Backed out changeset 05fd55926206 (bug 1505284)
---
 dom/media/platforms/ffmpeg/FFmpegDecoderModule.h | 13 ++++---------
 modules/libpref/init/StaticPrefList.h            |  2 +-
 modules/libpref/init/all.js                      |  1 -
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h b/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h
index 199d77049e11..dd82bc2be2fa 100644
--- a/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h
+++ b/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h
@@ -7,11 +7,10 @@
 #ifndef __FFmpegDecoderModule_h__
 #define __FFmpegDecoderModule_h__
 
-#include "FFmpegAudioDecoder.h"
-#include "FFmpegLibWrapper.h"
-#include "FFmpegVideoDecoder.h"
 #include "PlatformDecoderModule.h"
-#include "VPXDecoder.h"
+#include "FFmpegLibWrapper.h"
+#include "FFmpegAudioDecoder.h"
+#include "FFmpegVideoDecoder.h"
 #include "mozilla/StaticPrefs.h"
 
 namespace mozilla {
@@ -38,12 +37,8 @@ class FFmpegDecoderModule : public PlatformDecoderModule {
     if (aParams.VideoConfig().HasAlpha()) {
       return nullptr;
     }
-    if (VPXDecoder::IsVPX(aParams.mConfig.mMimeType) &&
-        aParams.mOptions.contains(CreateDecoderParams::Option::LowLatency) &&
+    if (aParams.mOptions.contains(CreateDecoderParams::Option::LowLatency) &&
         !StaticPrefs::MediaFfmpegLowLatencyEnabled()) {
-      // We refuse to create a decoder with low latency enabled if it's VP8 or
-      // VP9 unless specifically allowed: this will fallback to libvpx later.
-      // decoder
       return nullptr;
     }
     RefPtr<MediaDataDecoder> decoder = new FFmpegVideoDecoder<V>(
diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h
index 2dfde02c86a9..5f61fe02c725 100644
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -1126,7 +1126,7 @@ VARCACHE_PREF(
 VARCACHE_PREF(
   "media.navigator.mediadatadecoder_h264_enabled",
    MediaNavigatorMediadatadecoderH264Enabled,
-  RelaxedAtomicBool, true
+  bool, false
 )
 #endif // MOZ_WEBRTC
 
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index fdf531751b7f..887e82b6bbf9 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -463,7 +463,6 @@ pref("media.navigator.video.max_fr", 60);
 pref("media.navigator.video.h264.level", 31); // 0x42E01f - level 3.1
 pref("media.navigator.video.h264.max_br", 0);
 pref("media.navigator.video.h264.max_mbps", 0);
-pref("media.navigator.mediadatadecoder_h264_enabled", true);
 pref("media.peerconnection.video.vp9_enabled", true);
 pref("media.peerconnection.video.vp9_preferred", false);
 pref("media.getusermedia.browser.enabled", false);