Commit a613d042 authored by Marton Balint's avatar Marton Balint

avcodec/libxavs2: use AV_OPT_TYPE_DICT for xavs2-params

Signed-off-by: 's avatarMarton Balint <cus@passwd.hu>
parent 91f64ea4
...@@ -48,7 +48,7 @@ typedef struct XAVS2EContext { ...@@ -48,7 +48,7 @@ typedef struct XAVS2EContext {
int log_level; int log_level;
void *encoder; void *encoder;
char *xavs2_opts; AVDictionary *xavs2_opts;
xavs2_outpacket_t packet; xavs2_outpacket_t packet;
xavs2_param_t *param; xavs2_param_t *param;
...@@ -92,17 +92,11 @@ static av_cold int xavs2_init(AVCodecContext *avctx) ...@@ -92,17 +92,11 @@ static av_cold int xavs2_init(AVCodecContext *avctx)
xavs2_opt_set2("OpenGOP", "%d", !(avctx->flags & AV_CODEC_FLAG_CLOSED_GOP)); xavs2_opt_set2("OpenGOP", "%d", !(avctx->flags & AV_CODEC_FLAG_CLOSED_GOP));
if (cae->xavs2_opts) { {
AVDictionary *dict = NULL;
AVDictionaryEntry *en = NULL; AVDictionaryEntry *en = NULL;
while ((en = av_dict_get(cae->xavs2_opts, "", en, AV_DICT_IGNORE_SUFFIX)))
if (!av_dict_parse_string(&dict, cae->xavs2_opts, "=", ":", 0)) {
while ((en = av_dict_get(dict, "", en, AV_DICT_IGNORE_SUFFIX))) {
xavs2_opt_set2(en->key, "%s", en->value); xavs2_opt_set2(en->key, "%s", en->value);
} }
av_dict_free(&dict);
}
}
/* Rate control */ /* Rate control */
if (avctx->bit_rate > 0) { if (avctx->bit_rate > 0) {
...@@ -267,7 +261,7 @@ static const AVOption options[] = { ...@@ -267,7 +261,7 @@ static const AVOption options[] = {
{ "min_qp" , "min qp for rate control" , OFFSET(min_qp) , AV_OPT_TYPE_INT, {.i64 = 20 }, 0, 63, VE }, { "min_qp" , "min qp for rate control" , OFFSET(min_qp) , AV_OPT_TYPE_INT, {.i64 = 20 }, 0, 63, VE },
{ "speed_level" , "Speed level, higher is better but slower", OFFSET(preset_level) , AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 9, VE }, { "speed_level" , "Speed level, higher is better but slower", OFFSET(preset_level) , AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 9, VE },
{ "log_level" , "log level: -1: none, 0: error, 1: warning, 2: info, 3: debug", OFFSET(log_level) , AV_OPT_TYPE_INT, {.i64 = 0 }, -1, 3, VE }, { "log_level" , "log level: -1: none, 0: error, 1: warning, 2: info, 3: debug", OFFSET(log_level) , AV_OPT_TYPE_INT, {.i64 = 0 }, -1, 3, VE },
{ "xavs2-params" , "set the xavs2 configuration using a :-separated list of key=value parameters", OFFSET(xavs2_opts), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "xavs2-params" , "set the xavs2 configuration using a :-separated list of key=value parameters", OFFSET(xavs2_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE },
{ NULL }, { NULL },
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment