highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/libsvtav1: add a svtav1-params option to pass a list of key=value parameters

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2022-02-16 10:37:02 -03:00
parent 636631d9db
commit c33b404885
2 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/encoders.texi
View File

@ -1816,6 +1816,10 @@ Set log2 of the number of rows of tiles to use (0-6).
@item tile_columns @item tile_columns
Set log2 of the number of columns of tiles to use (0-4). Set log2 of the number of columns of tiles to use (0-4).
@item svtav1-params
Set SVT-AV1 options using a list of @var{key}=@var{value} pairs separated
by ":". See the SVT-AV1 encoder user guide for a list of accepted parameters.
@end table @end table
@section libkvazaar @section libkvazaar

52
libavcodec/libsvtav1.c
View File

@ -60,6 +60,7 @@ typedef struct SvtContext {
EOS_STATUS eos_flag; EOS_STATUS eos_flag;
// User options. // User options.
AVDictionary *svtav1_opts;
int hierarchical_level; int hierarchical_level;
int la_depth; int la_depth;
int enc_mode; int enc_mode;
@ -151,6 +152,41 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
{ {
SvtContext *svt_enc = avctx->priv_data; SvtContext *svt_enc = avctx->priv_data;
const AVPixFmtDescriptor *desc; const AVPixFmtDescriptor *desc;
AVDictionaryEntry *en = NULL;
// Update param from options
param->hierarchical_levels = svt_enc->hierarchical_level;
param->enc_mode = svt_enc->enc_mode;
param->tier = svt_enc->tier;
param->rate_control_mode = svt_enc->rc_mode;
param->scene_change_detection = svt_enc->scd;
param->qp = svt_enc->qp;
if (svt_enc->la_depth >= 0)
param->look_ahead_distance = svt_enc->la_depth;
param->tile_columns = svt_enc->tile_columns;
param->tile_rows = svt_enc->tile_rows;
#if SVT_AV1_CHECK_VERSION(0, 9, 1)
while ((en = av_dict_get(svt_enc->svtav1_opts, "", en, AV_DICT_IGNORE_SUFFIX))) {
EbErrorType ret = svt_av1_enc_parse_parameter(param, en->key, en->value);
if (ret != EB_ErrorNone) {
int level = (avctx->err_recognition & AV_EF_EXPLODE) ? AV_LOG_ERROR : AV_LOG_WARNING;
av_log(avctx, level, "Error parsing option %s: %s.\n", en->key, en->value);
if (avctx->err_recognition & AV_EF_EXPLODE)
return AVERROR(EINVAL);
}
}
#else
if ((en = av_dict_get(svt_enc->svtav1_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
int level = (avctx->err_recognition & AV_EF_EXPLODE) ? AV_LOG_ERROR : AV_LOG_WARNING;
av_log(avctx, level, "svt-params needs libavcodec to be compiled with SVT-AV1 "
"headers >= 0.9.1.\n");
if (avctx->err_recognition & AV_EF_EXPLODE)
return AVERROR(ENOSYS);
}
#endif
param->source_width = avctx->width; param->source_width = avctx->width;
param->source_height = avctx->height; param->source_height = avctx->height;
@ -184,14 +220,6 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
param->profile = FF_PROFILE_AV1_HIGH; param->profile = FF_PROFILE_AV1_HIGH;
} }
// Update param from options
param->hierarchical_levels = svt_enc->hierarchical_level;
param->enc_mode = svt_enc->enc_mode;
param->tier = svt_enc->tier;
param->rate_control_mode = svt_enc->rc_mode;
param->scene_change_detection = svt_enc->scd;
param->qp = svt_enc->qp;
param->target_bit_rate = avctx->bit_rate; param->target_bit_rate = avctx->bit_rate;
if (avctx->gop_size > 0) if (avctx->gop_size > 0)
@ -214,12 +242,6 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
/* 2 = IDR, closed GOP, 1 = CRA, open GOP */ /* 2 = IDR, closed GOP, 1 = CRA, open GOP */
param->intra_refresh_type = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ? 2 : 1; param->intra_refresh_type = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ? 2 : 1;
if (svt_enc->la_depth >= 0)
param->look_ahead_distance = svt_enc->la_depth;
param->tile_columns = svt_enc->tile_columns;
param->tile_rows = svt_enc->tile_rows;
return 0; return 0;
} }
@ -535,6 +557,8 @@ static const AVOption options[] = {
{ "tile_columns", "Log2 of number of tile columns to use", OFFSET(tile_columns), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 4, VE}, { "tile_columns", "Log2 of number of tile columns to use", OFFSET(tile_columns), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 4, VE},
{ "tile_rows", "Log2 of number of tile rows to use", OFFSET(tile_rows), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 6, VE}, { "tile_rows", "Log2 of number of tile rows to use", OFFSET(tile_rows), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 6, VE},
{ "svtav1-params", "Set the SVT-AV1 configuration using a :-separated list of key=value parameters", OFFSET(svtav1_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE },
{NULL}, {NULL},
}; };