[FFmpeg-cvslog] avcodec/mediacodecenc: add option to select codec by name

[Zhao Zhili]

ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Fri Nov 25 12:01:29 2022 +0800| [3dcb630ca1906c66c3e8d042de46470b51659c27] | committer: Zhao Zhili

avcodec/mediacodecenc: add option to select codec by name

Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3dcb630ca1906c66c3e8d042de46470b51659c27
---

 libavcodec/mediacodecenc.c | 8 +++++++-
 libavcodec/version.h       | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c
index a4390a9df6..693faca118 100644
--- a/libavcodec/mediacodecenc.c
+++ b/libavcodec/mediacodecenc.c
@@ -43,6 +43,7 @@ typedef struct MediaCodecEncContext {
     AVClass *avclass;
     FFAMediaCodec *codec;
     int use_ndk_codec;
+    const char *name;
     FFANativeWindow *window;
 
     int fps;
@@ -126,7 +127,10 @@ static av_cold int mediacodec_init(AVCodecContext *avctx)
         av_assert0(0);
     }
 
-    s->codec = ff_AMediaCodec_createEncoderByType(codec_mime, s->use_ndk_codec);
+    if (s->name)
+        s->codec = ff_AMediaCodec_createCodecByName(s->name, s->use_ndk_codec);
+    else
+        s->codec = ff_AMediaCodec_createEncoderByType(codec_mime, s->use_ndk_codec);
     if (!s->codec) {
         av_log(avctx, AV_LOG_ERROR, "Failed to create encoder for type %s\n",
                codec_mime);
@@ -474,6 +478,8 @@ static const AVCodecHWConfigInternal *const mediacodec_hw_configs[] = {
 static const AVOption common_options[] = {
     { "ndk_codec", "Use MediaCodec from NDK",
                     OFFSET(use_ndk_codec), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE },
+    { "codec_name", "Select codec by name",
+                    OFFSET(name), AV_OPT_TYPE_STRING, {0}, 0, 0, VE },
     { NULL },
 };
 
diff --git a/libavcodec/version.h b/libavcodec/version.h
index d149bc6c46..9e66920593 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
 #include "version_major.h"
 
 #define LIBAVCODEC_VERSION_MINOR  54
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \