mozilla-firefox
diff --git a/‎dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp‎
Lines changed: 4 additions & 12 deletions b/‎dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp‎
Lines changed: 4 additions & 12 deletions
diff --git a/‎dom/media/test/mochitest_compat.toml‎
Lines changed: 2 additions & 6 deletions b/‎dom/media/test/mochitest_compat.toml‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎dom/media/test/test_non_8bit_video.html‎ renamed to ‎dom/media/test/test_av1_high_professional_profiles.html‎
Lines changed: 6 additions & 7 deletions b/‎dom/media/test/test_non_8bit_video.html‎ renamed to ‎dom/media/test/test_av1_high_professional_profiles.html‎
Lines changed: 6 additions & 7 deletions
diff --git a/‎dom/media/test/vp9-yuv420p10.webm^headers^‎
Lines changed: 0 additions & 1 deletion b/‎dom/media/test/vp9-yuv420p10.webm^headers^‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎dom/media/test/vp9-yuv420p12.webm‎
-23.4 KB b/‎dom/media/test/vp9-yuv420p12.webm‎
-23.4 KB
diff --git a/‎dom/media/test/vp9-yuv420p12.webm^headers^‎
Lines changed: 0 additions & 1 deletion b/‎dom/media/test/vp9-yuv420p12.webm^headers^‎
Lines changed: 0 additions & 1 deletion
@@ -649,11 +649,6 @@ void FFmpegVideoDecoder<LIBAV_VER>::InitHWDecoderIfAllowed() {
 }
 #endif  // MOZ_USE_HWDECODE
 
-static bool ShouldEnable8BitConversion(const struct AVCodec* aCodec) {
-  return 0 == strncmp(aCodec->name, "libdav1d", 8) ||
-         0 == strncmp(aCodec->name, "vp9", 3);
-}
-
 RefPtr<MediaDataDecoder::InitPromise> FFmpegVideoDecoder<LIBAV_VER>::Init() {
   AUTO_PROFILER_LABEL("FFmpegVideoDecoder::Init", MEDIA_PLAYBACK);
   FFMPEG_LOG("FFmpegVideoDecoder, init, IsHardwareAccelerated=%d\n",
@@ -666,9 +661,11 @@ RefPtr<MediaDataDecoder::InitPromise> FFmpegVideoDecoder<LIBAV_VER>::Init() {
   if (NS_FAILED(rv)) {
     return InitPromise::CreateAndReject(rv, __func__);
   }
-  m8BitOutput = m8BitOutput && ShouldEnable8BitConversion(mCodecContext->codec);
+  // Enable 8-bit conversion only for dav1d.
+  m8BitOutput =
+      m8BitOutput && 0 == strncmp(mCodecContext->codec->name, "libdav1d", 8);
   if (m8BitOutput) {
-    FFMPEG_LOG("Enable 8-bit output for %s", mCodecContext->codec->name);
+    FFMPEG_LOG("Enable 8-bit output for dav1d");
     m8BitRecycleBin = MakeRefPtr<BufferRecycleBin>();
   }
   return InitPromise::CreateAndResolve(TrackInfo::kVideoTrack, __func__);
@@ -1689,11 +1686,6 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::CreateImage(
   // that. If this shared memory buffer path also generated a
   // MacIOSurfaceImage, then we could use it for HDR.
   requiresCopy = (b.mColorDepth != gfx::ColorDepth::COLOR_8);
-#  endif
-#  ifdef MOZ_WIDGET_ANDROID
-  // Some Android devices can only render 8-bit images and cannot use high
-  // bit-depth decoded data directly.
-  requiresCopy = m8BitOutput && b.mColorDepth != gfx::ColorDepth::COLOR_8;
 #  endif
   if (mIsUsingShmemBufferForDecode && *mIsUsingShmemBufferForDecode &&
       !requiresCopy) {
 
@@ -694,10 +694,6 @@ support-files = [
   "video-overhang.ogg^headers^",
   "vp9-superframes.webm",
   "vp9-superframes.webm^headers^",
-  "vp9-yuv420p10.webm",
-  "vp9-yuv420p10.webm^headers^",
-  "vp9-yuv420p12.webm",
-  "vp9-yuv420p12.webm^headers^",
   "vp9.webm",
   "vp9.webm^headers^",
   "vp9-short.webm",
@@ -770,6 +766,8 @@ support-files = [
 ["test_audioDocumentTitle.html"]
 skip-if = ["true"] # bug 475110 - disabled since we don't play Wave files standalone
 
+["test_av1_high_professional_profiles.html"]
+
 ["test_buffered.html"]
 
 ["test_bug1431810_opus_downmix_to_mono.html"]
@@ -898,8 +896,6 @@ skip-if = ["os == 'win' && os_version == '11.26100' && arch == 'x86_64' && debug
 
 ["test_no_load_event.html"]
 
-["test_non_8bit_video.html"]
-
 ["test_not_reset_playbackRate_when_removing_nonloaded_media_from_document.html"]
 
 ["test_paused.html"]
 
@@ -1,25 +1,24 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>Test 10/12-bit video files</title>
+<title>Test High and Professional profile AV1 video files</title>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 <script type="application/javascript">
 
-/** This test checks if 10- and 12-bit video plays. */
-const videos = ["av1-yuv444p10.webm", "av1-yuv422p10.webm", "av1-yuv444p12.webm",
-                "vp9-yuv420p10.webm", "vp9-yuv420p12.webm"];
+/** This test checks if 10- and 12-bit AV1 video plays. */
+const av1Files = ["av1-yuv444p10.webm", "av1-yuv422p10.webm", "av1-yuv444p12.webm"];
 add_task(async function testPlayAll() {
-  await Promise.all(videos.map(
+  await Promise.all(av1Files.map(
     (f) => {
       let v = document.createElement("video");
       document.body.appendChild(v);
       v.src = f;
       return v;
     }).map(
       (v) => v.play())).then(
-        () => ok(true, "All video played."),
-        (e) => ok(false, "Play video error: " + e));
+        () => ok(true, "All AV1 video played."),
+        (e) => ok(false, "Play AV1 video error: " + e));
 });
 
 </script>