[vlc-commits] [Git][videolan/vlc][master] 5 commits: d3d9: remove no-op variable callback

[Hugo Beauzée-Luyssen (@chouquette)]

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


Commits:
9416bd11 by Rémi Denis-Courmont at 2022-02-08T10:50:38+00:00
d3d9: remove no-op variable callback

The registered callback does nothing with the given variable name.

- - - - -
5ce987e5 by Rémi Denis-Courmont at 2022-02-08T10:50:38+00:00
d3d9: remove unused configuration item

- - - - -
f8cc28ca by Rémi Denis-Courmont at 2022-02-08T10:50:38+00:00
d3d11: remove no-op variable callback

The registered callback does nothing with the given variable name.

- - - - -
1ba7ee2d by Rémi Denis-Courmont at 2022-02-08T10:50:38+00:00
d3d11: remove write-only field

- - - - -
ca13fe63 by Rémi Denis-Courmont at 2022-02-08T10:50:38+00:00
d3d11: remove unused configuration item

- - - - -


2 changed files:

- modules/hw/d3d11/d3d11_filters.c
- modules/hw/d3d9/d3d9_filters.c


Changes:

=====================================
modules/hw/d3d11/d3d11_filters.c
=====================================
@@ -63,7 +63,6 @@ struct filter_level
 typedef struct
 {
     float f_gamma;
-    bool  b_brightness_threshold;
 
     struct filter_level Brightness;
     struct filter_level Contrast;
@@ -81,10 +80,6 @@ typedef struct
     ID3D11VideoProcessorOutputView *procOutput[PROCESSOR_SLICES];
 } filter_sys_t;
 
-#define THRES_TEXT N_("Brightness threshold")
-#define THRES_LONGTEXT N_("When this mode is enabled, pixels will be " \
-        "shown as black or white. The threshold value will be the brightness " \
-        "defined below." )
 #define CONT_TEXT N_("Image contrast (0-2)")
 #define CONT_LONGTEXT N_("Set the image contrast, between 0 and 2. Defaults to 1.")
 #define HUE_TEXT N_("Image hue (0-360)")
@@ -97,8 +92,7 @@ typedef struct
 #define GAMMA_LONGTEXT N_("Set the image gamma, between 0.01 and 10. Defaults to 1.")
 
 static const char *const ppsz_filter_options[] = {
-    "contrast", "brightness", "hue", "saturation", "gamma",
-    "brightness-threshold", NULL
+    "contrast", "brightness", "hue", "saturation", "gamma", NULL
 };
 
 static bool ApplyFilter( filter_sys_t *p_sys,
@@ -344,8 +338,6 @@ static void D3D11CloseAdjust(filter_t *filter)
     var_DelCallback( filter, "hue",        AdjustCallback, sys );
     var_DelCallback( filter, "saturation", AdjustCallback, sys );
     var_DelCallback( filter, "gamma",      AdjustCallback, sys );
-    var_DelCallback( filter, "brightness-threshold",
-                                             AdjustCallback, sys );
 
     for (int i=0; i<PROCESSOR_SLICES; i++)
     {
@@ -455,16 +447,12 @@ static int D3D11OpenAdjust(filter_t *filter)
     InitLevel(filter, &sys->Hue,        "hue",        0.0 );
     InitLevel(filter, &sys->Saturation, "saturation", 1.0 );
     sys->f_gamma = var_CreateGetFloatCommand( filter, "gamma" );
-    sys->b_brightness_threshold =
-        var_CreateGetBoolCommand( filter, "brightness-threshold" );
 
     var_AddCallback( filter, "contrast",   AdjustCallback, sys );
     var_AddCallback( filter, "brightness", AdjustCallback, sys );
     var_AddCallback( filter, "hue",        AdjustCallback, sys );
     var_AddCallback( filter, "saturation", AdjustCallback, sys );
     var_AddCallback( filter, "gamma",      AdjustCallback, sys );
-    var_AddCallback( filter, "brightness-threshold",
-                                             AdjustCallback, sys );
 
     hr = ID3D11VideoDevice_CreateVideoProcessor(sys->d3d_proc.d3dviddev,
                                                 sys->d3d_proc.procEnumerator, 0,
@@ -584,9 +572,6 @@ vlc_module_begin()
     add_float_with_range( "gamma", 1.0, 0.01, 10.0,
                           GAMMA_TEXT, GAMMA_LONGTEXT )
         change_safe()
-    add_bool( "brightness-threshold", false,
-              THRES_TEXT, THRES_LONGTEXT )
-        change_safe()
 
     add_submodule()
     set_description(N_("Direct3D11 deinterlace filter"))


=====================================
modules/hw/d3d9/d3d9_filters.c
=====================================
@@ -63,10 +63,6 @@ typedef struct
     struct filter_level Saturation;
 } filter_sys_t;
 
-#define THRES_TEXT N_("Brightness threshold")
-#define THRES_LONGTEXT N_("When this mode is enabled, pixels will be " \
-        "shown as black or white. The threshold value will be the brightness " \
-        "defined below." )
 #define CONT_TEXT N_("Image contrast (0-2)")
 #define CONT_LONGTEXT N_("Set the image contrast, between 0 and 2. Defaults to 1.")
 #define HUE_TEXT N_("Image hue (0-360)")
@@ -79,8 +75,7 @@ typedef struct
 #define GAMMA_LONGTEXT N_("Set the image gamma, between 0.01 and 10. Defaults to 1.")
 
 static const char *const ppsz_filter_options[] = {
-    "contrast", "brightness", "hue", "saturation", "gamma",
-    "brightness-threshold", NULL
+    "contrast", "brightness", "hue", "saturation", "gamma", NULL
 };
 
 static void FillSample( DXVA2_VideoSample *p_sample,
@@ -431,8 +426,6 @@ static int D3D9OpenAdjust(filter_t *filter)
     var_AddCallback( filter, "hue",        AdjustCallback, sys );
     var_AddCallback( filter, "saturation", AdjustCallback, sys );
     var_AddCallback( filter, "gamma",      AdjustCallback, sys );
-    var_AddCallback( filter, "brightness-threshold",
-                                             AdjustCallback, sys );
 
     hr = IDirectXVideoProcessorService_CreateVideoProcessor( processor,
                                                              processorGUID,
@@ -506,9 +499,6 @@ vlc_module_begin()
     add_float_with_range( "gamma", 1.0, 0.01, 10.0,
                           GAMMA_TEXT, GAMMA_LONGTEXT )
         change_safe()
-    add_bool( "brightness-threshold", false,
-              THRES_TEXT, THRES_LONGTEXT )
-        change_safe()
 
     add_submodule()
     set_description(N_("Direct3D9 deinterlace filter"))



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a5a1fe7ff864280ab3ec06903a617d920e4ec15f...ca13fe633e6ae017c850327a1d7b94b65b4f5f5b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a5a1fe7ff864280ab3ec06903a617d920e4ec15f...ca13fe633e6ae017c850327a1d7b94b65b4f5f5b
You're receiving this email because of your account on code.videolan.org.