RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/vf_libplacebo: update peak detection options 

Upstream peak detection lost one option and gained one option. Update
code and documentation as required.
This commit is contained in:
Niklas Haas 2023-05-15 10:57:42 +02:00
parent 643cf2ec46
commit 21715ecff1
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/filters.texi
View File

@ -16341,10 +16341,11 @@ logarithmic scale between @code{0.0} and @code{100.0}. Default to @code{5.5}
and @code{10.0}, respectively. Setting either to a negative value disables
this functionality.
@item overshoot
Peak smoothing overshoot margin, between @code{0.0} and @code{1.0}. Provides a
safety margin to prevent clipping as a result of peak smoothing. Defaults to
@code{0.05}, corresponding to a margin of 5%.
@item percentile
Which percentile of the frame brightness histogram to use as the source peak
for tone-mapping. Defaults to @code{99.995}, a fairly conservative value.
Setting this to @code{100.0} disables frame histogram measurement and instead
uses the true peak brightness for tone-mapping.
@end table
@subsubsection Tone mapping

11
libavfilter/vf_libplacebo.c
View File

@ -197,7 +197,7 @@ typedef struct LibplaceboContext {
float min_peak;
float scene_low;
float scene_high;
float overshoot;
float percentile;
/* pl_color_map_params */
struct pl_color_map_params color_map_params;
@ -218,6 +218,7 @@ typedef struct LibplaceboContext {
int intent;
int tonemapping_mode;
float crosstalk;
float overshoot;
#endif
/* pl_dither_params */
@ -411,7 +412,12 @@ static int update_settings(AVFilterContext *ctx)
.minimum_peak = s->min_peak,
.scene_threshold_low = s->scene_low,
.scene_threshold_high = s->scene_high,
#if PL_API_VER >= 263
.percentile = s->percentile,
#endif
#if FF_API_LIBPLACEBO_OPTS && PL_API_VER < 256
.overshoot_margin = s->overshoot,
#endif
);
s->color_map_params = *pl_color_map_params(
@ -1204,7 +1210,7 @@ static const AVOption libplacebo_options[] = {
{ "minimum_peak", "Peak detection minimum peak", OFFSET(min_peak), AV_OPT_TYPE_FLOAT, {.dbl = 1.0}, 0.0, 100.0, DYNAMIC },
{ "scene_threshold_low", "Scene change low threshold", OFFSET(scene_low), AV_OPT_TYPE_FLOAT, {.dbl = 5.5}, -1.0, 100.0, DYNAMIC },
{ "scene_threshold_high", "Scene change high threshold", OFFSET(scene_high), AV_OPT_TYPE_FLOAT, {.dbl = 10.0}, -1.0, 100.0, DYNAMIC },
{ "overshoot", "Tone-mapping overshoot margin", OFFSET(overshoot), AV_OPT_TYPE_FLOAT, {.dbl = 0.05}, 0.0, 1.0, DYNAMIC },
{ "percentile", "Peak detection percentile", OFFSET(percentile), AV_OPT_TYPE_FLOAT, {.dbl = 99.995}, 0.0, 100.0, DYNAMIC },
{ "gamut_mode", "Gamut-mapping mode", OFFSET(gamut_mode), AV_OPT_TYPE_INT, {.i64 = GAMUT_MAP_PERCEPTUAL}, 0, GAMUT_MAP_COUNT - 1, DYNAMIC, "gamut_mode" },
{ "clip", "Hard-clip (RGB per-channel)", 0, AV_OPT_TYPE_CONST, {.i64 = GAMUT_MAP_CLIP}, 0, 0, STATIC, "gamut_mode" },
@ -1254,6 +1260,7 @@ static const AVOption libplacebo_options[] = {
{ "hybrid", "Hybrid of Luma/RGB", 0, AV_OPT_TYPE_CONST, {.i64 = 3}, 0, 0, STATIC, "tonemap_mode" },
{ "luma", "Luminance", 0, AV_OPT_TYPE_CONST, {.i64 = 4}, 0, 0, STATIC, "tonemap_mode" },
{ "tonemapping_crosstalk", "Crosstalk factor for tone-mapping", OFFSET(crosstalk), AV_OPT_TYPE_FLOAT, {.dbl = 0.04}, 0.0, 0.30, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
{ "overshoot", "Tone-mapping overshoot margin", OFFSET(overshoot), AV_OPT_TYPE_FLOAT, {.dbl = 0.05}, 0.0, 1.0, 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" },