virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mediacodecenc: add option to select codec by name

Browse Source 
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili
2022-11-25 12:01:29 +08:00
parent 567633895b
commit 3dcb630ca1
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mediacodecenc.c
View File

@@ -43,6 +43,7 @@ typedef struct MediaCodecEncContext {
AVClass *avclass; AVClass *avclass;
FFAMediaCodec *codec; FFAMediaCodec *codec;
int use_ndk_codec; int use_ndk_codec;
const char *name;
FFANativeWindow *window; FFANativeWindow *window;
int fps; int fps;
@@ -126,7 +127,10 @@ static av_cold int mediacodec_init(AVCodecContext *avctx)
av_assert0(0); 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) { if (!s->codec) {
av_log(avctx, AV_LOG_ERROR, "Failed to create encoder for type %s\n", av_log(avctx, AV_LOG_ERROR, "Failed to create encoder for type %s\n",
codec_mime); codec_mime);
@@ -474,6 +478,8 @@ static const AVCodecHWConfigInternal *const mediacodec_hw_configs[] = {
static const AVOption common_options[] = { static const AVOption common_options[] = {
{ "ndk_codec", "Use MediaCodec from NDK", { "ndk_codec", "Use MediaCodec from NDK",
OFFSET(use_ndk_codec), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE }, 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 }, { NULL },
}; };

2
libavcodec/version.h
View File

@@ -30,7 +30,7 @@
#include "version_major.h" #include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 54 #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, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \