add VIDEO_FILTER_TOGGLE hotkey & video_filter_enable settings (#19033)

* add `settings->bools.video_filter_enable`

see gfx/video_driver.c

* add CMD_VIDEO_FILTER_TOGGLE via hotkey

Author: Apaczer

command.h

@@ -109,6 +109,8 @@ enum event_command
    CMD_EVENT_VOLUME_DOWN,
    CMD_EVENT_MIXER_VOLUME_UP,
    CMD_EVENT_MIXER_VOLUME_DOWN,
+   /* Toggles Video Filter*/
+   CMD_VIDEO_FILTER_TOGGLE,
    /* Toggles FPS counter. */
    CMD_EVENT_FPS_TOGGLE,
    /* Toggles statistics display. */
@@ -530,6 +532,7 @@ static const struct cmd_map map[] = {
    { "VRR_RUNLOOP_TOGGLE",     RARCH_VRR_RUNLOOP_TOGGLE },
    { "RUNAHEAD_TOGGLE",        RARCH_RUNAHEAD_TOGGLE },
    { "PREEMPT_TOGGLE",         RARCH_PREEMPT_TOGGLE },
+   { "VIDEO_FILTER_TOGGLE",    RARCH_VIDEO_FILTER_TOGGLE },
    { "FPS_TOGGLE",             RARCH_FPS_TOGGLE },
    { "STATISTICS_TOGGLE",      RARCH_STATISTICS_TOGGLE },
    { "AI_SERVICE",             RARCH_AI_SERVICE },

config.def.keybinds.h

@@ -619,6 +619,13 @@ static const struct retro_keybind retro_keybinds_1[] = {
       RARCH_PREEMPT_TOGGLE, NO_BTN, NO_BTN, 0,
       true
    },
+   {
+      NULL, NULL,
+      AXIS_NONE, AXIS_NONE,
+      MENU_ENUM_LABEL_VALUE_INPUT_META_VIDEO_FILTER_TOGGLE, RETROK_UNKNOWN,
+      RARCH_VIDEO_FILTER_TOGGLE, NO_BTN, NO_BTN, 0,
+      true
+   },
    {
       NULL, NULL,
       AXIS_NONE, AXIS_NONE,
@@ -1286,6 +1293,13 @@ static const struct retro_keybind retro_keybinds_1[] = {
       RARCH_PREEMPT_TOGGLE, NO_BTN, NO_BTN, 0,
       true
    },
+   {
+      NULL, NULL,
+      AXIS_NONE, AXIS_NONE,
+      MENU_ENUM_LABEL_VALUE_INPUT_META_VIDEO_FILTER_TOGGLE, RETROK_UNKNOWN,
+      RARCH_VIDEO_FILTER_TOGGLE, NO_BTN, NO_BTN, 0,
+      true
+   },
    {
       NULL, NULL,
       AXIS_NONE, AXIS_NONE,
@@ -1963,6 +1977,13 @@ static const struct retro_keybind retro_keybinds_1[] = {
       RARCH_PREEMPT_TOGGLE, NO_BTN, NO_BTN, 0,
       true
    },
+   {
+      NULL, NULL,
+      AXIS_NONE, AXIS_NONE,
+      MENU_ENUM_LABEL_VALUE_INPUT_META_VIDEO_FILTER_TOGGLE, RETROK_UNKNOWN,
+      RARCH_VIDEO_FILTER_TOGGLE, NO_BTN, NO_BTN, 0,
+      true
+   },
    {
       NULL, NULL,
       AXIS_NONE, AXIS_NONE,
@@ -2623,6 +2644,13 @@ static const struct retro_keybind retro_keybinds_rest[] = {
       RARCH_PREEMPT_TOGGLE, NO_BTN, NO_BTN, 0,
       true
    },
+   {
+      NULL, NULL,
+      AXIS_NONE, AXIS_NONE,
+      MENU_ENUM_LABEL_VALUE_INPUT_META_VIDEO_FILTER_TOGGLE, RETROK_UNKNOWN,
+      RARCH_VIDEO_FILTER_TOGGLE, NO_BTN, NO_BTN, 0,
+      true
+   },
    {
       NULL, NULL,
       AXIS_NONE, AXIS_NONE,

configuration.c

@@ -415,6 +415,7 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
    DECLARE_META_BIND(2, toggle_vrr_runloop,    RARCH_VRR_RUNLOOP_TOGGLE,     MENU_ENUM_LABEL_VALUE_INPUT_META_VRR_RUNLOOP_TOGGLE),
    DECLARE_META_BIND(2, runahead_toggle,       RARCH_RUNAHEAD_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_RUNAHEAD_TOGGLE),
    DECLARE_META_BIND(2, preempt_toggle,        RARCH_PREEMPT_TOGGLE,         MENU_ENUM_LABEL_VALUE_INPUT_META_PREEMPT_TOGGLE),
+   DECLARE_META_BIND(2, video_filter_toggle,   RARCH_VIDEO_FILTER_TOGGLE,    MENU_ENUM_LABEL_VALUE_INPUT_META_VIDEO_FILTER_TOGGLE),
    DECLARE_META_BIND(2, fps_toggle,            RARCH_FPS_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE),
    DECLARE_META_BIND(2, toggle_statistics,     RARCH_STATISTICS_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_STATISTICS_TOGGLE),
    DECLARE_META_BIND(2, ai_service,            RARCH_AI_SERVICE,             MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE),
@@ -1826,6 +1827,7 @@ static struct config_bool_setting *populate_settings_bool(
    SETTING_BOOL("pause_on_disconnect",           &settings->bools.pause_on_disconnect, true, DEFAULT_PAUSE_ON_DISCONNECT, false);
    SETTING_BOOL("auto_screenshot_filename",      &settings->bools.auto_screenshot_filename, true, DEFAULT_AUTO_SCREENSHOT_FILENAME, false);
    SETTING_BOOL("suspend_screensaver_enable",    &settings->bools.ui_suspend_screensaver_enable, true, true, false);
+   SETTING_BOOL("video_filter_enable",           &settings->bools.video_filter_enable, true, true, false);
    SETTING_BOOL("apply_cheats_after_toggle",     &settings->bools.apply_cheats_after_toggle, true, DEFAULT_APPLY_CHEATS_AFTER_TOGGLE, false);
    SETTING_BOOL("apply_cheats_after_load",       &settings->bools.apply_cheats_after_load, true, DEFAULT_APPLY_CHEATS_AFTER_LOAD, false);
    SETTING_BOOL("rewind_enable",                 &settings->bools.rewind_enable, true, DEFAULT_REWIND_ENABLE, false);

configuration.h

@@ -703,6 +703,7 @@ typedef struct settings
       bool video_framecount_show;
       bool video_memory_show;
       bool video_msg_bgcolor_enable;
+      bool video_filter_enable;
 #ifdef _3DS
       bool video_3ds_lcd_bottom;
 #endif

gfx/video_driver.c

@@ -3314,6 +3314,7 @@ void video_driver_build_info(video_frame_info_t *video_info)
    video_info->preemptive_frames           = settings->bools.preemptive_frames_enable;
    video_info->runahead_frames             = settings->uints.run_ahead_frames;
    video_info->fps_show                    = settings->bools.video_fps_show;
+   video_info->filter_enable                    = settings->bools.video_filter_enable;
    video_info->memory_show                 = settings->bools.video_memory_show;
    video_info->statistics_show             = settings->bools.video_statistics_show;
    video_info->framecount_show             = settings->bools.video_framecount_show;
@@ -4150,6 +4151,7 @@ void video_driver_frame(const void *data, unsigned width,
       unsigned height, size_t pitch)
 {
    char status_text[256];
+   settings_t *settings = config_get_ptr();
    static char video_driver_msg[256];
    static retro_time_t last_time;
    static retro_time_t curr_time;
@@ -4561,7 +4563,7 @@ void video_driver_frame(const void *data, unsigned width,
             pitch, runloop_idle);
 
 #ifdef HAVE_VIDEO_FILTER
-   if (render_frame && data && video_st->state_filter)
+   if (settings->bools.video_filter_enable && render_frame && data && video_st->state_filter)
    {
       unsigned output_width                             = 0;
       unsigned output_height                            = 0;

gfx/video_driver.h

@@ -441,6 +441,7 @@ typedef struct video_frame_info
    bool runahead_second_instance;
    bool preemptive_frames;
    bool fps_show;
+   bool filter_enable;
    bool memory_show;
    bool statistics_show;
    bool framecount_show;

input/input_defines.h

@@ -182,6 +182,7 @@ enum
    RARCH_VRR_RUNLOOP_TOGGLE,
    RARCH_RUNAHEAD_TOGGLE,
    RARCH_PREEMPT_TOGGLE,
+   RARCH_VIDEO_FILTER_TOGGLE,
    RARCH_FPS_TOGGLE,
    RARCH_STATISTICS_TOGGLE,
    RARCH_AI_SERVICE,

input/input_driver.c

@@ -8006,13 +8006,15 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
             {0,                RARCH_UI_COMPANION_TOGGLE     },
             {0,                RARCH_FPS_TOGGLE              },
             {0,                RARCH_NETPLAY_HOST_TOGGLE     },
+            {0,                RARCH_VIDEO_FILTER_TOGGLE     },
          };
 
          ids[14][0] = input_config_binds[0][RARCH_QUIT_KEY].key;
          ids[15][0] = input_config_binds[0][RARCH_FULLSCREEN_TOGGLE_KEY].key;
          ids[16][0] = input_config_binds[0][RARCH_UI_COMPANION_TOGGLE].key;
          ids[17][0] = input_config_binds[0][RARCH_FPS_TOGGLE].key;
          ids[18][0] = input_config_binds[0][RARCH_NETPLAY_HOST_TOGGLE].key;
+         ids[19][0] = input_config_binds[0][RARCH_VIDEO_FILTER_TOGGLE].key;
 
          if (settings->bools.input_menu_swap_ok_cancel_buttons)
          {

intl/msg_hash_lbl.h

@@ -1672,6 +1672,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_FPS_SHOW,
    MENU_ENUM_LABEL_FPS_SHOW_STR
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_FILTER_ENABLE,
+   "filter_enable"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_STATISTICS_SHOW,
    MENU_ENUM_LABEL_STATISTICS_SHOW_STR

intl/msg_hash_us.h

@@ -1816,6 +1816,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_SYNCHRONIZATION_SETTINGS,
    "Change video synchronization settings."
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_FILTER_ENABLE,
+   "Apply Video Filter. Is a hint that does not necessarily have to be honored by the video driver."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_ENABLE,
+   "Video Filter Enable"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE,
    "Suspend Screensaver"
@@ -4127,6 +4135,14 @@ MSG_HASH(
    "Switches Preemptive Frames on/off."
    )
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_INPUT_META_VIDEO_FILTER_TOGGLE,
+   "Video Filter Apply (Toggle)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_INPUT_META_VIDEO_FILTER_TOGGLE,
+   "Switches software 'Vide Filter' on/off."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE,
    "Show FPS (Toggle)"
@@ -15851,6 +15867,15 @@ MSG_HASH(
    MSG_VIDEO_REFRESH_RATE_CHANGED,
    "Video refresh rate changed to %s Hz."
    )
+MSG_HASH(
+   MSG_VIDEO_FILTER_ENABLE_ON,
+   "Video-Filter: Enable"
+   )
+MSG_HASH(
+   MSG_VIDEO_FILTER_ENABLE_OFF,
+   "Video-Filter: Disable"
+   )
+
 
 /* Lakka */