| Message ID | 20230510202912.658437-1-ccom@randomderp.com |
|---|---|
| State | Accepted |
| Commit | 7958325a832e9dd0807e35a123da5028a521f1c7 |
| Headers | show |
| Series | [FFmpeg-devel] libavcodec/libsvtav1: Allow -1 for preset option | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 5/10/2023 5:29 PM, Christopher Degawa wrote: > Currently, the -1 (MR) preset is disallowed as it's taken as the preset > option not set, and the only way to access it was through svtav1-params. > > Signed-off-by: Christopher Degawa <ccom@randomderp.com> > --- > libavcodec/libsvtav1.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c > index 9174e2753c..952ed0e1e7 100644 > --- a/libavcodec/libsvtav1.c > +++ b/libavcodec/libsvtav1.c > @@ -170,7 +170,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, > param->look_ahead_distance = svt_enc->la_depth; > #endif > > - if (svt_enc->enc_mode >= 0) > + if (svt_enc->enc_mode >= -1) > param->enc_mode = svt_enc->enc_mode; > > if (avctx->bit_rate) { > @@ -593,7 +593,7 @@ static const AVOption options[] = { > { "high", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, VE, "tier" }, > #endif > { "preset", "Encoding preset", > - OFFSET(enc_mode), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, MAX_ENC_PRESET, VE }, > + OFFSET(enc_mode), AV_OPT_TYPE_INT, { .i64 = -2 }, -2, MAX_ENC_PRESET, VE }, > > FF_AV1_PROFILE_OPTS Applied.
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 9174e2753c..952ed0e1e7 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -170,7 +170,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->look_ahead_distance = svt_enc->la_depth; #endif - if (svt_enc->enc_mode >= 0) + if (svt_enc->enc_mode >= -1) param->enc_mode = svt_enc->enc_mode; if (avctx->bit_rate) { @@ -593,7 +593,7 @@ static const AVOption options[] = { { "high", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, VE, "tier" }, #endif { "preset", "Encoding preset", - OFFSET(enc_mode), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, MAX_ENC_PRESET, VE }, + OFFSET(enc_mode), AV_OPT_TYPE_INT, { .i64 = -2 }, -2, MAX_ENC_PRESET, VE }, FF_AV1_PROFILE_OPTS
Currently, the -1 (MR) preset is disallowed as it's taken as the preset option not set, and the only way to access it was through svtav1-params. Signed-off-by: Christopher Degawa <ccom@randomderp.com> --- libavcodec/libsvtav1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)