ffmpeg | branch: master | Niklas Haas <g...@haasn.dev> | Wed Feb 19 19:28:59 2025 +0100| [5944c4b20a32b4a127ca91f87ab13ca2dbfb5611] | committer: Niklas Haas
avfilter/vf_libplacebo: remove deprecated options These were removed upstream and no longer have had any effect for a while now. Signed-off-by: Niklas Haas <g...@haasn.dev> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5944c4b20a32b4a127ca91f87ab13ca2dbfb5611 --- doc/filters.texi | 13 ------------- libavfilter/vf_libplacebo.c | 9 --------- 2 files changed, 22 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 512945b89b..0ba7d3035f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -16600,11 +16600,6 @@ Linear blend/fade between frames. Especially useful for constructing e.g. slideshows. @end table -@item lut_entries -Configures the size of scaler LUTs, ranging from @code{1} to @code{256}. The -default of @code{0} will pick libplacebo's internal default, typically -@code{64}. - @item antiringing Enables anti-ringing (for non-EWA filters). The value (between @code{0.0} and @code{1.0}) configures the strength of the anti-ringing algorithm. May increase @@ -16726,10 +16721,6 @@ Peak detection smoothing period, between @code{0.0} and @code{1000.0}. Higher values result in peak detection becoming less responsive to changes in the input. Defaults to @code{100.0}. -@item minimum_peak -Lower bound on the detected peak (relative to SDR white), between @code{0.0} -and @code{100.0}. Defaults to @code{1.0}. - @item scene_threshold_low @item scene_threshold_high Lower and upper thresholds for scene change detection. Expressed in a @@ -16934,10 +16925,6 @@ attempting to squeeze the maximum performance at the cost of quality. @item skip_aa Disable anti-aliasing when downscaling. -@item polar_cutoff -Truncate polar (EWA) scaler kernels below this absolute magnitude, between -@code{0.0} and @code{1.0}. - @item disable_linear Disable linear light scaling. diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 0b91aba21b..e47c5f9c7d 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -202,11 +202,9 @@ typedef struct LibplaceboContext { char *upscaler; char *downscaler; char *frame_mixer; - int lut_entries; float antiringing; int sigmoid; int skip_aa; - float polar_cutoff; int disable_linear; int disable_builtin; int force_dither; @@ -234,7 +232,6 @@ typedef struct LibplaceboContext { /* pl_peak_detect_params */ int peakdetect; float smoothing; - float min_peak; float scene_low; float scene_high; float percentile; @@ -399,7 +396,6 @@ static int update_settings(AVFilterContext *ctx) opts->peak_detect_params = *pl_peak_detect_params( .smoothing_period = s->smoothing, - .minimum_peak = s->min_peak, .scene_threshold_low = s->scene_low, .scene_threshold_high = s->scene_high, #if PL_API_VER >= 263 @@ -432,7 +428,6 @@ static int update_settings(AVFilterContext *ctx) ); opts->params = *pl_render_params( - .lut_entries = s->lut_entries, .antiringing_strength = s->antiringing, .background_transparency = 1.0f - (float) s->fillcolor[3] / UINT8_MAX, .background_color = { @@ -457,7 +452,6 @@ static int update_settings(AVFilterContext *ctx) .num_hooks = s->num_hooks, .skip_anti_aliasing = s->skip_aa, - .polar_cutoff = s->polar_cutoff, .disable_linear_scaling = s->disable_linear, .disable_builtin_scalers = s->disable_builtin, .force_dither = s->force_dither, @@ -1378,7 +1372,6 @@ static const AVOption libplacebo_options[] = { { "upscaler", "Upscaler function", OFFSET(upscaler), AV_OPT_TYPE_STRING, {.str = "spline36"}, .flags = DYNAMIC }, { "downscaler", "Downscaler function", OFFSET(downscaler), AV_OPT_TYPE_STRING, {.str = "mitchell"}, .flags = DYNAMIC }, { "frame_mixer", "Frame mixing function", OFFSET(frame_mixer), AV_OPT_TYPE_STRING, {.str = "none"}, .flags = DYNAMIC }, - { "lut_entries", "Number of scaler LUT entries", OFFSET(lut_entries), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 256, DYNAMIC }, { "antiringing", "Antiringing strength (for non-EWA filters)", OFFSET(antiringing), AV_OPT_TYPE_FLOAT, {.dbl = 0.0}, 0.0, 1.0, DYNAMIC }, { "sigmoid", "Enable sigmoid upscaling", OFFSET(sigmoid), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DYNAMIC }, { "apply_filmgrain", "Apply film grain metadata", OFFSET(apply_filmgrain), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DYNAMIC }, @@ -1405,7 +1398,6 @@ static const AVOption libplacebo_options[] = { { "peak_detect", "Enable dynamic peak detection for HDR tone-mapping", OFFSET(peakdetect), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DYNAMIC }, { "smoothing_period", "Peak detection smoothing period", OFFSET(smoothing), AV_OPT_TYPE_FLOAT, {.dbl = 100.0}, 0.0, 1000.0, DYNAMIC }, - { "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 }, { "percentile", "Peak detection percentile", OFFSET(percentile), AV_OPT_TYPE_FLOAT, {.dbl = 99.995}, 0.0, 100.0, DYNAMIC }, @@ -1461,7 +1453,6 @@ static const AVOption libplacebo_options[] = { /* Performance/quality tradeoff options */ { "skip_aa", "Skip anti-aliasing", OFFSET(skip_aa), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, - { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0.0, 1.0, DYNAMIC }, { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
