diff mbox series

[FFmpeg-devel,1/4] lavc/mediacodecenc: Add pix2color_fmt() and color2pix_fmt()

Message ID fd61547526fef3c8367f249297d3588b9c1fe2e3.camel@haerdin.se
State New
Headers show
Series [FFmpeg-devel,1/4] lavc/mediacodecenc: Add pix2color_fmt() and color2pix_fmt() | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Tomas Härdin Feb. 24, 2023, 8:59 a.m. UTC

Comments

Zhao Zhili Feb. 28, 2023, 12:02 p.m. UTC | #1 
> +static int pix2color_fmt(AVCodecContext *avctx, enum AVPixelFormat pix_fmt)
> +{
> +    for (int i = 0; i < FF_ARRAY_ELEMS(color_formats); i++) {
> +        if (pix_fmt == color_formats[i].pix_fmt) {
> +            return color_formats[i].color_format;
> +        }
> +    }
> +    av_assert0(0);
> +}

After extracting to a general function, there is no hint that pix_fmt comes
from avctx->pix_fmt. So I prefer return error code here.

> +
> +static enum AVPixelFormat color2pix_fmt(AVCodecContext *avctx, int color_format)
> +{
> +    for (int i = 0; i < FF_ARRAY_ELEMS(color_formats); i++) {
> +        if (color_format == color_formats[i].color_format) {
> +            return color_formats[i].pix_fmt;
> +        }
> +    }
> +    av_assert0(0);
> +}
diff mbox series

Patch

From 7374dab21cb37dc14d2481c72d333b435e23a76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
Date: Tue, 10 Jan 2023 20:37:18 +0100
Subject: [PATCH 1/4] lavc/mediacodecenc: Add pix2color_fmt() and
 color2pix_fmt()

This patch has been released by Epic Games' legal department.
---
 libavcodec/mediacodecenc.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c
index a92a8dc5a9..03c80cbf99 100644
--- a/libavcodec/mediacodecenc.c
+++ b/libavcodec/mediacodecenc.c
@@ -2,6 +2,7 @@ 
  * Android MediaCodec encoders
  *
  * Copyright (c) 2022 Zhao Zhili <zhilizhao@tencent.com>
+ * Modifications by Epic Games, Inc., 2023.
  *
  * This file is part of FFmpeg.
  *
@@ -110,6 +111,26 @@  static void mediacodec_output_format(AVCodecContext *avctx)
     ff_AMediaFormat_delete(out_format);
 }
 
+static int pix2color_fmt(AVCodecContext *avctx, enum AVPixelFormat pix_fmt)
+{
+    for (int i = 0; i < FF_ARRAY_ELEMS(color_formats); i++) {
+        if (pix_fmt == color_formats[i].pix_fmt) {
+            return color_formats[i].color_format;
+        }
+    }
+    av_assert0(0);
+}
+
+static enum AVPixelFormat color2pix_fmt(AVCodecContext *avctx, int color_format)
+{
+    for (int i = 0; i < FF_ARRAY_ELEMS(color_formats); i++) {
+        if (color_format == color_formats[i].color_format) {
+            return color_formats[i].pix_fmt;
+        }
+    }
+    av_assert0(0);
+}
+
 static int mediacodec_init_bsf(AVCodecContext *avctx)
 {
     MediaCodecEncContext *s = avctx->priv_data;
@@ -235,13 +256,7 @@  static av_cold int mediacodec_init(AVCodecContext *avctx)
         }
     }
 
-    for (int i = 0; i < FF_ARRAY_ELEMS(color_formats); i++) {
-        if (avctx->pix_fmt == color_formats[i].pix_fmt) {
-            ff_AMediaFormat_setInt32(format, "color-format",
-                                     color_formats[i].color_format);
-            break;
-        }
-    }
+    ff_AMediaFormat_setInt32(format, "color-format", pix2color_fmt(avctx, avctx->pix_fmt));
 
     if (avctx->bit_rate)
         ff_AMediaFormat_setInt32(format, "bitrate", avctx->bit_rate);
-- 
2.30.2