History

avfilter/vf_libplacebo: remove deprecated options

These were removed upstream and no longer have had any effect for a while now.

Niklas Haas committed 1 year ago

Commit 5944c4b1 parent 27814dc2 files · +0 −22Browse files

Unified · Split

2 files
  1. doc/filters.texi +0 −13
  2. libavfilter/vf_libplacebo.c +0 −9
doc/filters.texi+0−13
@@ -16600,11 +16600,6 @@ Linear blend/fade between frames. Especially useful for constructing e.g. · 16599 unmodified lines
16600slideshows.16600slideshows.
16601@end table16601@end table
16602 16602
16603@item lut_entries
16604Configures the size of scaler LUTs, ranging from @code{1} to @code{256}. The
16605default of @code{0} will pick libplacebo's internal default, typically
16606@code{64}.
16607
16608@item antiringing16603@item antiringing
16609Enables anti-ringing (for non-EWA filters). The value (between @code{0.0} and16604Enables anti-ringing (for non-EWA filters). The value (between @code{0.0} and
16610@code{1.0}) configures the strength of the anti-ringing algorithm. May increase16605@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 · 115 unmodified lines
16726values result in peak detection becoming less responsive to changes in the16721values result in peak detection becoming less responsive to changes in the
16727input. Defaults to @code{100.0}.16722input. Defaults to @code{100.0}.
16728 16723
16729@item minimum_peak
16730Lower bound on the detected peak (relative to SDR white), between @code{0.0}
16731and @code{100.0}. Defaults to @code{1.0}.
16732
16733@item scene_threshold_low16724@item scene_threshold_low
16734@item scene_threshold_high16725@item scene_threshold_high
16735Lower and upper thresholds for scene change detection. Expressed in a16726Lower 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. · 198 unmodified lines
16934@item skip_aa16925@item skip_aa
16935Disable anti-aliasing when downscaling.16926Disable anti-aliasing when downscaling.
16936 16927
16937@item polar_cutoff
16938Truncate polar (EWA) scaler kernels below this absolute magnitude, between
16939@code{0.0} and @code{1.0}.
16940
16941@item disable_linear16928@item disable_linear
16942Disable linear light scaling.16929Disable linear light scaling.
16943 16930
libavfilter/vf_libplacebo.c+0−9
@@ -202,11 +202,9 @@ typedef struct LibplaceboContext { · 201 unmodified lines
202 char *upscaler;202 char *upscaler;
203 char *downscaler;203 char *downscaler;
204 char *frame_mixer;204 char *frame_mixer;
205 int lut_entries;
206 float antiringing;205 float antiringing;
207 int sigmoid;206 int sigmoid;
208 int skip_aa;207 int skip_aa;
209 float polar_cutoff;
210 int disable_linear;208 int disable_linear;
211 int disable_builtin;209 int disable_builtin;
212 int force_dither;210 int force_dither;
@@ -234,7 +232,6 @@ typedef struct LibplaceboContext { · 21 unmodified lines
234 /* pl_peak_detect_params */232 /* pl_peak_detect_params */
235 int peakdetect;233 int peakdetect;
236 float smoothing;234 float smoothing;
237 float min_peak;
238 float scene_low;235 float scene_low;
239 float scene_high;236 float scene_high;
240 float percentile;237 float percentile;
@@ -399,7 +396,6 @@ static int update_settings(AVFilterContext *ctx) · 158 unmodified lines
399 396
400 opts->peak_detect_params = *pl_peak_detect_params(397 opts->peak_detect_params = *pl_peak_detect_params(
401 .smoothing_period = s->smoothing,398 .smoothing_period = s->smoothing,
402 .minimum_peak = s->min_peak,
403 .scene_threshold_low = s->scene_low,399 .scene_threshold_low = s->scene_low,
404 .scene_threshold_high = s->scene_high,400 .scene_threshold_high = s->scene_high,
405#if PL_API_VER >= 263401#if PL_API_VER >= 263
@@ -432,7 +428,6 @@ static int update_settings(AVFilterContext *ctx) · 26 unmodified lines
432 );428 );
433 429
434 opts->params = *pl_render_params(430 opts->params = *pl_render_params(
435 .lut_entries = s->lut_entries,
436 .antiringing_strength = s->antiringing,431 .antiringing_strength = s->antiringing,
437 .background_transparency = 1.0f - (float) s->fillcolor[3] / UINT8_MAX,432 .background_transparency = 1.0f - (float) s->fillcolor[3] / UINT8_MAX,
438 .background_color = {433 .background_color = {
@@ -457,7 +452,6 @@ static int update_settings(AVFilterContext *ctx) · 18 unmodified lines
457 .num_hooks = s->num_hooks,452 .num_hooks = s->num_hooks,
458 453
459 .skip_anti_aliasing = s->skip_aa,454 .skip_anti_aliasing = s->skip_aa,
460 .polar_cutoff = s->polar_cutoff,
461 .disable_linear_scaling = s->disable_linear,455 .disable_linear_scaling = s->disable_linear,
462 .disable_builtin_scalers = s->disable_builtin,456 .disable_builtin_scalers = s->disable_builtin,
463 .force_dither = s->force_dither,457 .force_dither = s->force_dither,
@@ -1378,7 +1372,6 @@ static const AVOption libplacebo_options[] = { · 914 unmodified lines
1378 { "upscaler", "Upscaler function", OFFSET(upscaler), AV_OPT_TYPE_STRING, {.str = "spline36"}, .flags = DYNAMIC },1372 { "upscaler", "Upscaler function", OFFSET(upscaler), AV_OPT_TYPE_STRING, {.str = "spline36"}, .flags = DYNAMIC },
1379 { "downscaler", "Downscaler function", OFFSET(downscaler), AV_OPT_TYPE_STRING, {.str = "mitchell"}, .flags = DYNAMIC },1373 { "downscaler", "Downscaler function", OFFSET(downscaler), AV_OPT_TYPE_STRING, {.str = "mitchell"}, .flags = DYNAMIC },
1380 { "frame_mixer", "Frame mixing function", OFFSET(frame_mixer), AV_OPT_TYPE_STRING, {.str = "none"}, .flags = DYNAMIC },1374 { "frame_mixer", "Frame mixing function", OFFSET(frame_mixer), AV_OPT_TYPE_STRING, {.str = "none"}, .flags = DYNAMIC },
1381 { "lut_entries", "Number of scaler LUT entries", OFFSET(lut_entries), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 256, DYNAMIC },
1382 { "antiringing", "Antiringing strength (for non-EWA filters)", OFFSET(antiringing), AV_OPT_TYPE_FLOAT, {.dbl = 0.0}, 0.0, 1.0, DYNAMIC },1375 { "antiringing", "Antiringing strength (for non-EWA filters)", OFFSET(antiringing), AV_OPT_TYPE_FLOAT, {.dbl = 0.0}, 0.0, 1.0, DYNAMIC },
1383 { "sigmoid", "Enable sigmoid upscaling", OFFSET(sigmoid), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DYNAMIC },1376 { "sigmoid", "Enable sigmoid upscaling", OFFSET(sigmoid), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DYNAMIC },
1384 { "apply_filmgrain", "Apply film grain metadata", OFFSET(apply_filmgrain), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DYNAMIC },1377 { "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[] = { · 20 unmodified lines
1405 1398
1406 { "peak_detect", "Enable dynamic peak detection for HDR tone-mapping", OFFSET(peakdetect), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DYNAMIC },1399 { "peak_detect", "Enable dynamic peak detection for HDR tone-mapping", OFFSET(peakdetect), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DYNAMIC },
1407 { "smoothing_period", "Peak detection smoothing period", OFFSET(smoothing), AV_OPT_TYPE_FLOAT, {.dbl = 100.0}, 0.0, 1000.0, DYNAMIC },1400 { "smoothing_period", "Peak detection smoothing period", OFFSET(smoothing), AV_OPT_TYPE_FLOAT, {.dbl = 100.0}, 0.0, 1000.0, DYNAMIC },
1408 { "minimum_peak", "Peak detection minimum peak", OFFSET(min_peak), AV_OPT_TYPE_FLOAT, {.dbl = 1.0}, 0.0, 100.0, DYNAMIC },
1409 { "scene_threshold_low", "Scene change low threshold", OFFSET(scene_low), AV_OPT_TYPE_FLOAT, {.dbl = 5.5}, -1.0, 100.0, DYNAMIC },1401 { "scene_threshold_low", "Scene change low threshold", OFFSET(scene_low), AV_OPT_TYPE_FLOAT, {.dbl = 5.5}, -1.0, 100.0, DYNAMIC },
1410 { "scene_threshold_high", "Scene change high threshold", OFFSET(scene_high), AV_OPT_TYPE_FLOAT, {.dbl = 10.0}, -1.0, 100.0, DYNAMIC },1402 { "scene_threshold_high", "Scene change high threshold", OFFSET(scene_high), AV_OPT_TYPE_FLOAT, {.dbl = 10.0}, -1.0, 100.0, DYNAMIC },
1411 { "percentile", "Peak detection percentile", OFFSET(percentile), AV_OPT_TYPE_FLOAT, {.dbl = 99.995}, 0.0, 100.0, DYNAMIC },1403 { "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[] = { · 49 unmodified lines
1461 1453
1462 /* Performance/quality tradeoff options */1454 /* Performance/quality tradeoff options */
1463 { "skip_aa", "Skip anti-aliasing", OFFSET(skip_aa), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },1455 { "skip_aa", "Skip anti-aliasing", OFFSET(skip_aa), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
1464 { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0.0, 1.0, DYNAMIC },
1465 { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },1456 { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
1466 { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },1457 { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
1467 { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },1458 { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t