more rebasing

rel-257/libdav1d/patches/1452146-av1-66a1.patch

@@ -7,74 +7,13 @@ Bug 1452146 - flip av1 and rdd on for Win. r=drno
 
 Differential Revision: https://phabricator.services.mozilla.com/D13482
 
-diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h
---- a/modules/libpref/init/StaticPrefList.h
-+++ b/modules/libpref/init/StaticPrefList.h
-@@ -1092,21 +1092,27 @@ VARCACHE_PREF(
- #endif
- VARCACHE_PREF(
-   "media.gpu-process-decoder",
-    MediaGpuProcessDecoder,
-   RelaxedAtomicBool, PREF_VALUE
- )
- #undef PREF_VALUE
- 
-+#if defined(XP_WIN)
-+# define PREF_VALUE true
-+#else
-+# define PREF_VALUE false
-+#endif
- VARCACHE_PREF(
-   "media.rdd-process.enabled",
-    MediaRddProcessEnabled,
--  RelaxedAtomicBool, false
-+  RelaxedAtomicBool, PREF_VALUE
- )
-+#undef PREF_VALUE
- 
- VARCACHE_PREF(
-   "media.rdd-process.startup_timeout_ms",
-    MediaRddProcessStartupTimeoutMs,
-   RelaxedAtomicInt32, 5000
- )
- 
- #ifdef ANDROID
-@@ -1407,21 +1413,27 @@ VARCACHE_PREF(
- // WebM
- VARCACHE_PREF(
-   "media.webm.enabled",
-    MediaWebMEnabled,
-   RelaxedAtomicBool, true
- )
- 
- // AV1
-+#if defined(XP_WIN)
-+# define PREF_VALUE true
-+#else
-+# define PREF_VALUE false
-+#endif
- VARCACHE_PREF(
-   "media.av1.enabled",
-    MediaAv1Enabled,
--  RelaxedAtomicBool, false
-+  RelaxedAtomicBool, PREF_VALUE
- )
-+#undef PREF_VALUE
- VARCACHE_PREF(
-   "media.av1.use-dav1d",
-    MediaAv1UseDav1d,
-   RelaxedAtomicBool, false
- )
- 
- VARCACHE_PREF(
-   "media.flac.enabled",
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -637,17 +637,21 @@ pref("media.cubeb.sandbox", true);
- pref("media.audioipc.pool_size", 2);
- // 64 * 4 kB stack per pool thread.
- pref("media.audioipc.stack_size", 262144);
+@@ -668,17 +668,21 @@ pref("media.cubeb.logging_level", "");
+ // Cubeb sandbox (remoting) control
+ #ifdef XP_LINUX
+ pref("media.cubeb.sandbox", true);
  #else
  pref("media.cubeb.sandbox", false);
  #endif
@@ -89,8 +28,7 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
  pref("media.av1.use-dav1d", false);
  #endif
  
- pref("media.webaudio.audiocontextoptions-samplerate.enabled", true);
+ // Set to true to force demux/decode warnings to be treated as errors.
+ pref("media.playback.warnings-as-errors", false);
  
- // setSinkId expected to be unconditionally enabled in 63. Till then the
- // implementation will remain hidden behind this pref (Bug 1152401, Bug 934425).
-
+ // Weather we allow AMD switchable graphics

rel-257/libdav1d/patches/1493400-4-libdav1d-65a1.patch

@@ -11,11 +11,11 @@ diff --git a/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp b/dom/media/
 --- a/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp
 +++ b/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp
 @@ -10,16 +10,17 @@
+ #include "TheoraDecoder.h"
  #include "VPXDecoder.h"
  #include "VorbisDecoder.h"
  #include "WAVDecoder.h"
  #include "mozilla/Logging.h"
- #include "mozilla/StaticPrefs.h"
  
  #ifdef MOZ_AV1
  #include "AOMDecoder.h"
@@ -26,9 +26,9 @@ diff --git a/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp b/dom/media/
  
  bool AgnosticDecoderModule::SupportsMimeType(
      const nsACString& aMimeType, DecoderDoctorDiagnostics* aDiagnostics) const {
-   bool supports =
-       VPXDecoder::IsVPX(aMimeType) || OpusDataDecoder::IsOpus(aMimeType) ||
-@@ -41,17 +42,21 @@ already_AddRefed<MediaDataDecoder> Agnos
+   bool supports = VPXDecoder::IsVPX(aMimeType) ||
+                   OpusDataDecoder::IsOpus(aMimeType) ||
+@@ -42,17 +43,20 @@ already_AddRefed<MediaDataDecoder> Agnos
    RefPtr<MediaDataDecoder> m;
  
    if (VPXDecoder::IsVPX(aParams.mConfig.mMimeType)) {
@@ -36,13 +36,12 @@ diff --git a/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp b/dom/media/
    }
  #ifdef MOZ_AV1
    else if (AOMDecoder::IsAV1(aParams.mConfig.mMimeType) &&
-            StaticPrefs::MediaAv1Enabled()) {
+            MediaPrefs::AV1Enabled()) {
 -    m = new AOMDecoder(aParams);
-+    if (StaticPrefs::MediaAv1UseDav1d()) {
-+      m = new DAV1DDecoder(aParams);
-+    } else {
++    if (MediaPrefs::UseDav1d()) {
++      m = new Dav1dDecoder(aParams);
++    } else{
 +      m = new AOMDecoder(aParams);
-+    }
    }
  #endif
    else if (TheoraDecoder::IsTheora(aParams.mConfig.mMimeType)) {
@@ -51,6 +50,31 @@ diff --git a/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp b/dom/media/
  
    return m.forget();
  }
+diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build
+--- a/dom/media/platforms/moz.build
++++ b/dom/media/platforms/moz.build
+@@ -63,19 +63,21 @@ if CONFIG['MOZ_FFVPX']:
+ if CONFIG['MOZ_FFMPEG']:
+     DIRS += [
+         'ffmpeg',
+     ]
+ 
+ if CONFIG['MOZ_AV1']:
+     EXPORTS += [
+         'agnostic/AOMDecoder.h',
++        'agnostic/DAV1DDecoder.h',
+     ]
+     UNIFIED_SOURCES += [
+         'agnostic/AOMDecoder.cpp',
++        'agnostic/DAV1DDecoder.cpp',
+     ]
+ 
+ if CONFIG['MOZ_APPLEMEDIA']:
+   EXPORTS += [
+       'apple/AppleDecoderModule.h',
+   ]
+   UNIFIED_SOURCES += [
+       'apple/AppleATDecoder.cpp',
 diff --git a/dom/media/platforms/agnostic/DAV1DDecoder.cpp b/dom/media/platforms/agnostic/DAV1DDecoder.cpp
 new file mode 100644
 --- /dev/null
@@ -375,62 +399,12 @@ new file mode 100644
 +}  // namespace mozilla
 +
 +#endif  // DAV1DDecoder_h_
-diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build
---- a/dom/media/platforms/moz.build
-+++ b/dom/media/platforms/moz.build
-@@ -67,19 +67,21 @@ if CONFIG['MOZ_FFVPX']:
- if CONFIG['MOZ_FFMPEG']:
-     DIRS += [
-         'ffmpeg',
-     ]
- 
- if CONFIG['MOZ_AV1']:
-     EXPORTS += [
-         'agnostic/AOMDecoder.h',
-+        'agnostic/DAV1DDecoder.h',
-     ]
-     UNIFIED_SOURCES += [
-         'agnostic/AOMDecoder.cpp',
-+        'agnostic/DAV1DDecoder.cpp',
-     ]
- 
- if CONFIG['MOZ_OMX']:
-     EXPORTS += [
-         'omx/OmxCoreLibLinker.h',
-     ]
-     UNIFIED_SOURCES += [
-         'omx/OmxCoreLibLinker.cpp',
-diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h
---- a/modules/libpref/init/StaticPrefList.h
-+++ b/modules/libpref/init/StaticPrefList.h
-@@ -1392,16 +1392,21 @@ VARCACHE_PREF(
- )
- 
- // AV1
- VARCACHE_PREF(
-   "media.av1.enabled",
-    MediaAv1Enabled,
-   RelaxedAtomicBool, false
- )
-+VARCACHE_PREF(
-+  "media.av1.use-dav1d",
-+   MediaAv1UseDav1d,
-+  RelaxedAtomicBool, false
-+)
- 
- VARCACHE_PREF(
-   "media.flac.enabled",
-    MediaFlacEnabled,
-   bool, true
- )
- 
- // Hls
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -652,16 +652,18 @@ pref("media.audioipc.pool_size", 2);
- // 64 * 4 kB stack per pool thread.
- pref("media.audioipc.stack_size", 262144);
+@@ -669,16 +669,18 @@ pref("media.cubeb.logging_level", "");
+ #ifdef XP_LINUX
+ pref("media.cubeb.sandbox", true);
  #else
  pref("media.cubeb.sandbox", false);
  #endif
@@ -441,10 +415,9 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 +pref("media.av1.use-dav1d", false);
  #endif
  
- pref("media.webaudio.audiocontextoptions-samplerate.enabled", true);
+ // Set to true to force demux/decode warnings to be treated as errors.
+ pref("media.playback.warnings-as-errors", false);
  
- // setSinkId expected to be unconditionally enabled in 63. Till then the
- // implementation will remain hidden behind this pref (Bug 1152401, Bug 934425).
- pref("media.setsinkid.enabled", false);
+ // Weather we allow AMD switchable graphics
+ pref("layers.amd-switchable-gfx.enabled", true);
  
-

rel-257/libdav1d/patches/1521181-libdav1d-66a1.patch

@@ -7,61 +7,23 @@ Bug 1521181 - Pref on RDD/AV1 for OSX. r=drno
 
 Differential Revision: https://phabricator.services.mozilla.com/D17025
 
-diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h
---- a/modules/libpref/init/StaticPrefList.h
-+++ b/modules/libpref/init/StaticPrefList.h
-@@ -1142,16 +1142,18 @@ VARCACHE_PREF(
-   "media.gpu-process-decoder",
-    MediaGpuProcessDecoder,
-   RelaxedAtomicBool, PREF_VALUE
- )
- #undef PREF_VALUE
- 
- #if defined(XP_WIN) && !defined(_ARM64_)
- # define PREF_VALUE true
-+#elif defined(XP_MACOSX)
-+# define PREF_VALUE true
- #else
- # define PREF_VALUE false
- #endif
- VARCACHE_PREF(
-   "media.rdd-process.enabled",
-    MediaRddProcessEnabled,
-   RelaxedAtomicBool, PREF_VALUE
- )
-@@ -1463,16 +1465,18 @@ VARCACHE_PREF(
-   "media.webm.enabled",
-    MediaWebMEnabled,
-   RelaxedAtomicBool, true
- )
- 
- // AV1
- #if defined(XP_WIN) && !defined(_ARM64_)
- # define PREF_VALUE true
-+#elif defined(XP_MACOSX)
-+# define PREF_VALUE true
- #else
- # define PREF_VALUE false
- #endif
- VARCACHE_PREF(
-   "media.av1.enabled",
-    MediaAv1Enabled,
-   RelaxedAtomicBool, PREF_VALUE
- )
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -648,16 +648,18 @@ pref("media.audioipc.pool_size", 2);
- pref("media.audioipc.stack_size", 262144);
+@@ -668,17 +668,19 @@ pref("media.cubeb.logging_level", "");
+ // Cubeb sandbox (remoting) control
+ #ifdef XP_LINUX
+ pref("media.cubeb.sandbox", true);
  #else
  pref("media.cubeb.sandbox", false);
  #endif
  
  #ifdef MOZ_AV1
- #if defined(XP_WIN) && !defined(_ARM64_)
- pref("media.av1.enabled", true);
-+#elif defined(XP_MACOSX)
+-#if defined(XP_WIN)
++#if defined(XP_WIN) && !defined(_ARM64_)
 +pref("media.av1.enabled", true);
++#elif defined(XP_MACOSX)
+ pref("media.av1.enabled", true);
  #else
  pref("media.av1.enabled", false);
  #endif
@@ -69,5 +31,3 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
  pref("media.av1.use-dav1d", false);
  #endif
  
- pref("media.webaudio.audiocontextoptions-samplerate.enabled", true);
-