more rebasing

rel-257/libdav1d/patches/1471535-nonexisting_13_parts_65a1.patch

@@ -13,17 +13,17 @@ Differential Revision: https://phabricator.services.mozilla.com/D18028
 diff --git a/dom/media/test/can_play_type_webm.js b/dom/media/test/can_play_type_webm.js
 --- a/dom/media/test/can_play_type_webm.js
 +++ b/dom/media/test/can_play_type_webm.js
-@@ -31,14 +31,13 @@ async function check_webm(v, enabled) {
-     var pref = false;
-     try {
-       pref = SpecialPowers.getBoolPref(name);
-     } catch(ex) { }
-     return pref;
+@@ -40,14 +40,13 @@ async function check_webm(v, enabled) {
+            !navigator.userAgent.includes("Win64");
+   }
+ 
+   function isAndroid() {
+     return navigator.userAgent.includes("Android");
    }
  
    await SpecialPowers.pushPrefEnv({"set": [["media.av1.enabled", true]]});
--  // AV1 is disabled on Windows 32 bits (bug 1475564)
--  check("video/webm; codecs=\"av1\"", isWindows32() ? "" : "probably");
+-  // AV1 is disabled on Windows 32 bits (bug 1475564) and Android (bug 1368843)
+-  check("video/webm; codecs=\"av1\"", (isWindows32() || isAndroid()) ? "" : "probably");
 +  check("video/webm; codecs=\"av1\"", "probably");
  
    await SpecialPowers.pushPrefEnv({"set": [["media.av1.enabled", false]]});
@@ -32,22 +32,24 @@ diff --git a/dom/media/test/can_play_type_webm.js b/dom/media/test/can_play_type
 diff --git a/dom/media/test/test_can_play_type_mpeg.html b/dom/media/test/test_can_play_type_mpeg.html
 --- a/dom/media/test/test_can_play_type_mpeg.html
 +++ b/dom/media/test/test_can_play_type_mpeg.html
-@@ -91,23 +91,17 @@ function check_mp4(v, enabled) {
-   [ "video/mp4; codecs=vp9",
-     "video/mp4; codecs=\"vp9\"",
-     "video/mp4; codecs=\"vp9.0\""
-   ].forEach((codec) => {
-     // canPlayType should support VP9 in MP4...
-     check(codec, "probably");
+@@ -98,25 +98,18 @@ function check_mp4(v, enabled) {
+     check(codec, "");
+     // But VP9 in MP4 is supported in MSE.
      ok(MediaSource.isTypeSupported(codec), "VP9 in MP4 should be supported in MSE");
    });
+ 
+   check("video/mp4; codecs=vp9", "");
+   check("video/mp4; codecs=\"vp9\"", "");
+   check("video/mp4; codecs=\"vp9.0\"", "");
+-
 -  // AV1 is temporarily disabled on Win32 due to linker issues
 -  // https://bugzilla.mozilla.org/show_bug.cgi?id=1475564
--  if (!isWindows32()) {
+-  if (!(manifestNavigator().userAgent.includes("Windows") &&
+-      !manifestNavigator().userAgent.includes("x64"))) {
 -    check("video/mp4; codecs=\"av1\"", "probably");
 -  } else {
 -    check("video/mp4; codecs=\"av1\"", "");
--  }
+   }
 +  check("video/mp4; codecs=\"av1\"", "probably");
  }
  
@@ -60,7 +62,7 @@ diff --git a/dom/media/test/test_can_play_type_mpeg.html b/dom/media/test/test_c
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -420,21 +420,22 @@ set_config('MOZ_FFMPEG', ffmpeg)
+@@ -364,24 +364,25 @@ set_config('MOZ_FFMPEG', ffmpeg)
  set_define('MOZ_FFMPEG', ffmpeg)
  imply_option('--enable-fmp4', ffmpeg, '--enable-ffmpeg')
  
@@ -80,10 +82,13 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 +                c_compiler and c_compiler.type == 'msvc':
              enabled = False
          else:
-             enabled = True
+-            enabled = target.os != 'Android'
++            enabled = True
      if enabled:
          return True
  
  set_config('MOZ_AV1', av1)
  set_define('MOZ_AV1', av1)
-
+ 
+ # Built-in fragmented MP4 support.
+ # ==============================================================

rel-257/libdav1d/patches/1493611-av1-68a1.patch

@@ -10,9 +10,9 @@ Differential Revision: https://phabricator.services.mozilla.com/D24165
 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
-@@ -640,33 +640,33 @@ pref("media.video-queue.send-to-composit
- // Whether to disable the video stats to prevent fingerprinting
- pref("media.video_stats.enabled", true);
+@@ -661,30 +661,30 @@ pref("media.decoder.recycle.enabled", fa
+ //Weather MFR should try to skip to next key frame or not.
+ pref("media.decoder.skip-to-next-key-frame.enabled", true);
  
  // Log level for cubeb, the audio input/output system. Valid values are
  // "verbose", "normal" and "" (log disabled).
@@ -22,9 +22,6 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 -#ifdef XP_LINUX
 +#if defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID)
  pref("media.cubeb.sandbox", true);
- pref("media.audioipc.pool_size", 2);
- // 64 * 4 kB stack per pool thread.
- pref("media.audioipc.stack_size", 262144);
  #else
  pref("media.cubeb.sandbox", false);
  #endif
@@ -46,4 +43,3 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
  #endif
  #endif
  
-

rel-257/libdav1d/patches/1515641-2-libdav1d-67a1.patch

@@ -38,12 +38,12 @@ diff --git a/media/libdav1d/moz.build b/media/libdav1d/moz.build
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -372,16 +372,26 @@ option('--enable-av1',
- @depends('--enable-av1', target, milestone)
- def av1(value, target, milestone):
-     enabled = bool(value)
-     if value.origin == 'default' and milestone.is_nightly:
-         enabled = target.os != 'Android'
+@@ -376,16 +376,26 @@ def av1(value, target, c_compiler):
+         if target.os == 'WINNT' and target.cpu == 'x86' and \
+                 c_compiler and c_compiler.type == 'msvc':
+             enabled = False
+         else:
+             enabled = True
      if enabled:
          return True
  

rel-257/libdav1d/patches/1521062-libdav1d-67a1.patch

@@ -201,10 +201,10 @@ diff --git a/media/libdav1d/moz.build b/media/libdav1d/moz.build
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -374,24 +374,28 @@ def av1(value, target, milestone):
-     enabled = bool(value)
-     if value.origin == 'default' and milestone.is_nightly:
-         enabled = target.os != 'Android'
+@@ -378,24 +378,28 @@ def av1(value, target, c_compiler):
+             enabled = False
+         else:
+             enabled = True
      if enabled:
          return True
  

rel-257/libdav1d/patches/1533742-libdav1d-67a1.patch

@@ -10,8 +10,8 @@ Differential Revision: https://phabricator.services.mozilla.com/D22707
 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
-@@ -653,23 +653,24 @@ pref("media.audioipc.pool_size", 2);
- pref("media.audioipc.stack_size", 262144);
+@@ -670,23 +670,24 @@ pref("media.cubeb.logging_level", "");
+ pref("media.cubeb.sandbox", true);
  #else
  pref("media.cubeb.sandbox", false);
  #endif
@@ -31,10 +31,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/1536070-libdav1d-68a1.patch

@@ -128,10 +128,28 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -374,21 +374,17 @@ def av1(value, target, milestone):
+@@ -364,35 +364,27 @@ set_config('MOZ_FFMPEG', ffmpeg)
+ set_define('MOZ_FFMPEG', ffmpeg)
+ imply_option('--enable-fmp4', ffmpeg, '--enable-ffmpeg')
+ 
+ # AV1 Video Codec Support
+ # ==============================================================
+ option('--disable-av1',
+         help='Disable av1 video support')
+ 
+-@depends('--enable-av1', target, c_compiler)
+-def av1(value, target, c_compiler):
++@depends('--enable-av1', target, milestone)
++def av1(value, target, milestone):
      enabled = bool(value)
-     if value.origin == 'default' and milestone.is_nightly:
-         enabled = target.os != 'Android'
+-    if value.origin == 'default':
+-        if target.os == 'WINNT' and target.cpu == 'x86' and \
+-                c_compiler and c_compiler.type == 'msvc':
+-            enabled = False
+-        else:
+-            enabled = True
++    if value.origin == 'default' and milestone.is_nightly:
++        enabled = target.os != 'Android'
      if enabled:
          return True
  

rel-257/libdav1d/patches/1536538-2-libdav1d-68a1.patch

@@ -10,16 +10,17 @@ Differential Revision: https://phabricator.services.mozilla.com/D24072
 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
-@@ -658,17 +658,17 @@ pref("media.cubeb.sandbox", false);
+@@ -674,16 +674,19 @@ pref("media.cubeb.sandbox", false);
+ 
+ #ifdef MOZ_AV1
  #if defined(XP_WIN) && !defined(_ARM64_)
  pref("media.av1.enabled", true);
  pref("media.av1.use-dav1d", true);
  #elif defined(XP_MACOSX)
  pref("media.av1.enabled", true);
  pref("media.av1.use-dav1d", true);
- #elif defined(XP_UNIX)
- pref("media.av1.enabled", true);
--pref("media.av1.use-dav1d", false);
++#elif defined(XP_UNIX)
++pref("media.av1.enabled", true);
 +pref("media.av1.use-dav1d", true);
  #else
  pref("media.av1.enabled", false);
@@ -27,6 +28,5 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
  #endif
  #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);

rel-257/libdav1d/patches/TOP-9999999-dav1d-avoid-mColorDepth.patch

@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1598804644 14400
+#      Sun Aug 30 12:24:04 2020 -0400
+Avoid depndence on Bug 1493198.
+
+diff --git a/dom/media/platforms/agnostic/DAV1DDecoder.cpp b/dom/media/platforms/agnostic/DAV1DDecoder.cpp
+--- a/dom/media/platforms/agnostic/DAV1DDecoder.cpp
++++ b/dom/media/platforms/agnostic/DAV1DDecoder.cpp
+@@ -161,19 +161,19 @@ int DAV1DDecoder::GetPicture(DecodedData
+   aData.AppendElement(std::move(v));
+   return 0;
+ }
+ 
+ already_AddRefed<VideoData> DAV1DDecoder::ConstructImage(
+     const Dav1dPicture& aPicture) {
+   VideoData::YCbCrBuffer b;
+   if (aPicture.p.bpc == 10) {
+-    b.mColorDepth = ColorDepth::COLOR_10;
++    b.mBitDepth = 10;
+   } else if (aPicture.p.bpc == 12) {
+-    b.mColorDepth = ColorDepth::COLOR_12;
++    b.mBitDepth = 12;
+   }
+ 
+   // On every other case use the default (BT601).
+   if (aPicture.seq_hdr->color_description_present) {
+     if (aPicture.seq_hdr->pri == DAV1D_COLOR_PRI_BT709) {
+       b.mYUVColorSpace = YUVColorSpace::BT709;
+     }
+   } else if (aPicture.p.h >= 720) {

rel-257/libdav1d/patches/series

@@ -1910,6 +1910,7 @@ NOBUG-BACKOUT-1480092-libvpx-60.patch
 1533092-libdav1d-67a1.patch
 1519636-PARTIAL-libdav1d-67a1.patch
 1526435-libdav1d-67a1.patch
+TOP-9999999-dav1d-avoid-mColorDepth.patch
 1533559-libdav1d-68a1.patch
 1536538-1-libdav1d-68a1.patch
 1536538-2-libdav1d-68a1.patch