diff options
| author | Niklas Haas <git@haasn.dev> | 2023-03-13 15:10:26 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2023-03-13 11:30:58 -0300 |
| commit | 11eca6018c40f5ebe6af93cbc4b4dce447d8b3bc (patch) | |
| tree | 4edd3f0f6083df4fd515fb0e70f32072e8dd5a50 /libavfilter/vf_libplacebo.c | |
| parent | 7c130d6911f5b09bfc648f6ae678c4c0749f61bb (diff) | |
| download | ffmpeg-11eca6018c40f5ebe6af93cbc4b4dce447d8b3bc.tar.gz | |
avfilter/vf_libplacebo: wrap deprecated opts in FF_API define
Signed-off-by: Niklas Haas <git@haasn.dev>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/vf_libplacebo.c')
| -rw-r--r-- | libavfilter/vf_libplacebo.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 7cd495de26..d757232890 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -132,11 +132,14 @@ typedef struct LibplaceboContext { int inverse_tonemapping; float crosstalk; int tonemapping_lut_size; + +#if FF_API_LIBPLACEBO_OPTS /* for backwards compatibility */ float desat_str; float desat_exp; int gamut_warning; int gamut_clipping; +#endif /* pl_dither_params */ int dithering; @@ -380,6 +383,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in) pl_rect2df_aspect_set(&target.crop, aspect, s->pad_crop_ratio); } +#if FF_API_LIBPLACEBO_OPTS /* backwards compatibility with older API */ if (!tonemapping_mode && (s->desat_str >= 0.0f || s->desat_exp >= 0.0f)) { float str = s->desat_str < 0.0f ? 0.9f : s->desat_str; @@ -397,6 +401,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in) gamut_mode = PL_GAMUT_WARN; if (s->gamut_clipping) gamut_mode = PL_GAMUT_DESATURATE; +#endif /* Update render params */ params = (struct pl_render_params) { @@ -818,11 +823,14 @@ static const AVOption libplacebo_options[] = { { "inverse_tonemapping", "Inverse tone mapping (range expansion)", OFFSET(inverse_tonemapping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, { "tonemapping_crosstalk", "Crosstalk factor for tone-mapping", OFFSET(crosstalk), AV_OPT_TYPE_FLOAT, {.dbl = 0.04}, 0.0, 0.30, DYNAMIC }, { "tonemapping_lut_size", "Tone-mapping LUT size", OFFSET(tonemapping_lut_size), AV_OPT_TYPE_INT, {.i64 = 256}, 2, 1024, DYNAMIC }, + +#if FF_API_LIBPLACEBO_OPTS /* deprecated options for backwards compatibility, defaulting to -1 to not override the new defaults */ { "desaturation_strength", "Desaturation strength", OFFSET(desat_str), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 1.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, { "desaturation_exponent", "Desaturation exponent", OFFSET(desat_exp), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 10.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, { "gamut_warning", "Highlight out-of-gamut colors", OFFSET(gamut_warning), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, { "gamut_clipping", "Enable colorimetric gamut clipping", OFFSET(gamut_clipping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, +#endif { "dithering", "Dither method to use", OFFSET(dithering), AV_OPT_TYPE_INT, {.i64 = PL_DITHER_BLUE_NOISE}, -1, PL_DITHER_METHOD_COUNT - 1, DYNAMIC, "dither" }, { "none", "Disable dithering", 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, STATIC, "dither" }, |