tor-browser

commit f58ac665285a3ea9fb101c05949a0aefd335f9f7
parent f5986df439c7409c3d866ba3c516558065f8dec9
Author: Andrew Osmond <aosmond@gmail.com>
Date:   Thu,  8 Jan 2026 15:56:04 +0000

Bug 2008354 - Part 4. Handle input sample conversions from YUV420P and NV12. r=media-playback-reviewers,jolin

MediaCodec encoders prefer NV12, and otherwise we prefer to use YUV420P
with ffmpeg's software encoders.

Differential Revision: https://phabricator.services.mozilla.com/D277799

Diffstat:
M
dom/media/platforms/ffmpeg/FFmpegVideoEncoder.cpp
 | 
31
++++++++++++++++++++++++++-----

1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoEncoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoEncoder.cpp
@@ -386,6 +386,12 @@ MediaResult FFmpegVideoEncoder<LIBAV_VER>::InitEncoderInternal(bool aHardware) {
 #endif
 
   // And now the video-specific part
+#ifdef MOZ_WIDGET_ANDROID
+  // COLOR_FormatYUV420SemiPlanar(NV12) is the most widely supported
+  // format by the Android hardware encoders.
+  mCodecContext->pix_fmt =
+      aHardware ? ffmpeg::FFMPEG_PIX_FMT_NV12 : ffmpeg::FFMPEG_PIX_FMT_YUV420P;
+#else
   mCodecContext->pix_fmt = ffmpeg::FFMPEG_PIX_FMT_YUV420P;
   // // TODO: do this properly, based on the colorspace of the frame. Setting
   // this like that crashes encoders. if (mConfig.mCodec != CodecType::AV1) {
@@ -402,6 +408,8 @@ MediaResult FFmpegVideoEncoder<LIBAV_VER>::InitEncoderInternal(bool aHardware) {
   //       mCodecContext->color_trc = AVCOL_TRC_BT709;
   //     }
   // }
+#endif
+
   mCodecContext->width = static_cast<int>(mConfig.mSize.width);
   mCodecContext->height = static_cast<int>(mConfig.mSize.height);
   // Reasonnable default for the quantization range.
@@ -634,7 +642,7 @@ Result<MediaDataEncoder::EncodedData, MediaResult> FFmpegVideoEncoder<
 
   // Set AVFrame properties for its internal data allocation. For now, we always
   // convert into ffmpeg's buffer.
-  mFrame->format = ffmpeg::FFMPEG_PIX_FMT_YUV420P;
+  mFrame->format = mCodecContext->pix_fmt;
   mFrame->width = static_cast<int>(mConfig.mSize.width);
   mFrame->height = static_cast<int>(mConfig.mSize.height);
   mFrame->pict_type =
@@ -654,12 +662,25 @@ Result<MediaDataEncoder::EncodedData, MediaResult> FFmpegVideoEncoder<
                                          MakeErrorString(mLib, ret).get())));
   }
 
-  MediaResult rv = ConvertToI420(
-      sample->mImage, mFrame->data[0], mFrame->linesize[0], mFrame->data[1],
-      mFrame->linesize[1], mFrame->data[2], mFrame->linesize[2], mConfig.mSize);
+  nsresult rv;
+  switch (mFrame->format) {
+    case ffmpeg::FFMPEG_PIX_FMT_YUV420P:
+      rv = ConvertToI420(sample->mImage, mFrame->data[0], mFrame->linesize[0],
+                         mFrame->data[1], mFrame->linesize[1], mFrame->data[2],
+                         mFrame->linesize[2], mConfig.mSize);
+      break;
+    case ffmpeg::FFMPEG_PIX_FMT_NV12:
+      rv = ConvertToNV12(sample->mImage, mFrame->data[0], mFrame->linesize[0],
+                         mFrame->data[1], mFrame->linesize[1], mConfig.mSize);
+      break;
+    default:
+      MOZ_ASSERT_UNREACHABLE("unhandled ffmpeg format!");
+      rv = NS_ERROR_DOM_MEDIA_FATAL_ERR;
+      break;
+  }
   if (NS_FAILED(rv)) {
     return Err(MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
-                           "failed to convert format to I420"_ns));
+                           "failed to convert format to ffmpeg format"_ns));
   }
 
   // Set presentation timestamp and duration of the AVFrame. The unit of pts is