virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

avcodec/libx265: use AV_OPT_TYPE_DICT for x265-params

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2019-12-25 01:50:36 +01:00
parent dfea6d2e50
commit 91f64ea4c5
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavcodec/libx265.c
View File

@ -47,7 +47,7 @@ typedef struct libx265Context {
char *preset; char *preset;
char *tune; char *tune;
char *profile; char *profile;
char *x265_opts; AVDictionary *x265_opts;
/** /**
* If the encoder does not support ROI then warn the first time we * If the encoder does not support ROI then warn the first time we
@ -336,28 +336,23 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
return ret; return ret;
} }
if (ctx->x265_opts) { {
AVDictionary *dict = NULL;
AVDictionaryEntry *en = NULL; AVDictionaryEntry *en = NULL;
while ((en = av_dict_get(ctx->x265_opts, "", en, AV_DICT_IGNORE_SUFFIX))) {
int parse_ret = ctx->api->param_parse(ctx->params, en->key, en->value);
if (!av_dict_parse_string(&dict, ctx->x265_opts, "=", ":", 0)) { switch (parse_ret) {
while ((en = av_dict_get(dict, "", en, AV_DICT_IGNORE_SUFFIX))) { case X265_PARAM_BAD_NAME:
int parse_ret = ctx->api->param_parse(ctx->params, en->key, en->value); av_log(avctx, AV_LOG_WARNING,
"Unknown option: %s.\n", en->key);
switch (parse_ret) { break;
case X265_PARAM_BAD_NAME: case X265_PARAM_BAD_VALUE:
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_WARNING,
"Unknown option: %s.\n", en->key); "Invalid value for %s: %s.\n", en->key, en->value);
break; break;
case X265_PARAM_BAD_VALUE: default:
av_log(avctx, AV_LOG_WARNING, break;
"Invalid value for %s: %s.\n", en->key, en->value);
break;
default:
break;
}
} }
av_dict_free(&dict);
} }
} }
@ -645,7 +640,7 @@ static const AVOption options[] = {
{ "preset", "set the x265 preset", OFFSET(preset), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "preset", "set the x265 preset", OFFSET(preset), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ "tune", "set the x265 tune parameter", OFFSET(tune), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "tune", "set the x265 tune parameter", OFFSET(tune), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ "profile", "set the x265 profile", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "profile", "set the x265 profile", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ "x265-params", "set the x265 configuration using a :-separated list of key=value parameters", OFFSET(x265_opts), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "x265-params", "set the x265 configuration using a :-separated list of key=value parameters", OFFSET(x265_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE },
{ NULL } { NULL }
}; };