[vlc-commits] [Git][videolan/vlc][master] libplacebo: remove haasnsoft scaler

[Hugo Beauzée-Luyssen]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
75c26d8b by Niklas Haas at 2021-05-09T09:34:23+00:00
libplacebo: remove haasnsoft scaler

This was deprecated in libplacebo git master, but mistakenly removed
entirely for some (untagged) versions (specifically, v3.120 through
v3.137).

As such, this commit fixes build errors for those versions. (And gets
rid of a deprecation warning for v3.138+)

- - - - -


1 changed file:

- modules/video_output/placebo_utils.h


Changes:

=====================================
modules/video_output/placebo_utils.h
=====================================
@@ -241,8 +241,7 @@ enum {
     SCALE_GINSENG,
     SCALE_EWA_GINSENG,
     SCALE_EWA_HANN,
-    SCALE_HAASNSOFT,
-    SCALE_CATMULL_ROM,
+    SCALE_CATMULL_ROM = SCALE_EWA_HANN + 2, // preserve option order
     SCALE_ROBIDOUX,
     SCALE_ROBIDOUXSHARP,
     SCALE_EWA_ROBIDOUX,
@@ -267,7 +266,6 @@ static const int scale_values[] = {
     SCALE_GINSENG,
     SCALE_EWA_GINSENG,
     SCALE_EWA_HANN,
-    SCALE_HAASNSOFT,
     SCALE_CATMULL_ROM,
     SCALE_ROBIDOUX,
     SCALE_ROBIDOUXSHARP,
@@ -293,7 +291,6 @@ static const char * const scale_text[] = {
     "Ginseng 3 taps",
     "EWA Ginseng",
     "EWA Hann",
-    "HaasnSoft (blurred EWA Hann)",
     "Catmull-Rom",
     "Robidoux",
     "RobidouxSharp",
@@ -319,7 +316,6 @@ static const struct pl_filter_config *const scale_config[] = {
     [SCALE_EWA_LANCZOS]         = &pl_filter_ewa_lanczos,
     [SCALE_EWA_GINSENG]         = &pl_filter_ewa_ginseng,
     [SCALE_EWA_HANN]            = &pl_filter_ewa_hann,
-    [SCALE_HAASNSOFT]           = &pl_filter_haasnsoft,
     [SCALE_BICUBIC]             = &pl_filter_bicubic,
     [SCALE_CATMULL_ROM]         = &pl_filter_catmull_rom,
     [SCALE_MITCHELL]            = &pl_filter_mitchell,



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/75c26d8b449723db56ff56fd786247db071e692a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/75c26d8b449723db56ff56fd786247db071e692a
You're receiving this email because of your account on code.videolan.org.