vppフィルタのフラグの見直し。

rigaya · Nov 7, 2023 · 62aa71f · 62aa71f
1 parent aa4ba4a
commit 62aa71f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/VCECore/rgy_cmd.cpp b/VCECore/rgy_cmd.cpp
@@ -1018,11 +1018,7 @@ int parse_one_vpp_option(const TCHAR *option_name, const TCHAR *strInput[], int
  const auto paramList = std::vector<std::string>{
  "top", "bottom", "left", "right",
  "method_switch", "coeff_shift", "thre_shift", "thre_deint", "thre_motion_y", "thre_motion_c",
- "level", "shift", "drop", "smooth", "24fps", "tune", "timecode", "ini", "preset",
-#if ENABLE_VPP_FILTER_AFS_RFF
- "rff",
-#endif
- "log"
+ "level", "shift", "drop", "smooth", "24fps", "tune", "timecode", "ini", "preset", "rff", "log"
  };
 
  for (const auto &param : param_list) {
@@ -1220,7 +1216,7 @@ int parse_one_vpp_option(const TCHAR *option_name, const TCHAR *strInput[], int
  }
  continue;
  }
- if (param_arg == _T("rff") && ENABLE_VPP_FILTER_AFS_RFF) {
+ if (param_arg == _T("rff")) {
  bool b = false;
  if (!cmd_string_to_bool(&b, param_val)) {
  vpp->afs.rff = b;
@@ -7085,9 +7081,7 @@ tstring gen_cmd_help_vpp() {
  _T(" smooth=<bool> (スムージング) enable smoothing (default=%s)\n")
  _T(" 24fps=<bool> (24fps化) force 30fps->24fps (default=%s)\n")
  _T(" tune=<bool> (調整モード) show scan result (default=%s)\n")
-#if ENABLE_VPP_FILTER_AFS_RFF
  _T(" rff=<bool> rff flag aware (default=%s)\n")
-#endif
  _T(" timecode=<bool> output timecode (default=%s)\n")
  _T(" log=<bool> output log (default=%s)\n"),
  FILTER_DEFAULT_AFS_CLIP_TB, FILTER_DEFAULT_AFS_CLIP_TB,

diff --git a/VCECore/rgy_prm.h b/VCECore/rgy_prm.h
@@ -46,14 +46,13 @@ static const int DEFAULT_VIDEO_IGNORE_TIMESTAMP_ERROR = 10;
 #if ENCODER_NVENC
 #define ENABLE_VPP_FILTER_COLORSPACE (ENABLE_NVRTC)
 #else
-#define ENABLE_VPP_FILTER_COLORSPACE (ENCODER_QSV || ENCODER_VCEENC || ENCODER_MPP ||   CLFILTERS_AUF)
+#define ENABLE_VPP_FILTER_COLORSPACE (ENCODER_QSV   || ENCODER_VCEENC || ENCODER_MPP || CLFILTERS_AUF)
 #endif
 #define ENABLE_VPP_FILTER_AFS (ENCODER_QSV || ENCODER_NVENC || ENCODER_VCEENC || ENCODER_MPP)
-#define ENABLE_VPP_FILTER_AFS_RFF (ENCODER_QSV || ENCODER_NVENC || ENCODER_VCEENC || ENCODER_MPP)
 #define ENABLE_VPP_FILTER_NNEDI (ENCODER_QSV || ENCODER_NVENC || ENCODER_VCEENC || ENCODER_MPP || CLFILTERS_AUF)
 #define ENABLE_VPP_FILTER_YADIF (ENCODER_QSV || ENCODER_NVENC || ENCODER_VCEENC || ENCODER_MPP)
 #define ENABLE_VPP_FILTER_RFF (ENCODER_QSV || ENCODER_NVENC || ENCODER_VCEENC || ENCODER_MPP)
-#define ENABLE_VPP_FILTER_RFF_AVHW (ENCODER_QSV || ENCODER_NVENC)
+#define ENABLE_VPP_FILTER_RFF_AVHW (ENCODER_QSV || ENCODER_NVENC || ENCODER_MPP)
 #define ENABLE_VPP_FILTER_SELECT_EVERY (ENCODER_NVENC)
 #define ENABLE_VPP_FILTER_DECIMATE (ENCODER_QSV || ENCODER_NVENC || ENCODER_VCEENC || ENCODER_MPP)
 #define ENABLE_VPP_FILTER_MPDECIMATE (ENCODER_QSV || ENCODER_NVENC || ENCODER_VCEENC || ENCODER_MPP)
@@ -68,7 +67,7 @@ static const int DEFAULT_VIDEO_IGNORE_TIMESTAMP_ERROR = 10;
 #define ENABLE_VPP_FILTER_TWEAK (ENCODER_QSV || ENCODER_NVENC || ENCODER_VCEENC || ENCODER_MPP || CLFILTERS_AUF)
 #define ENABLE_VPP_FILTER_OVERLAY (ENCODER_QSV || ENCODER_NVENC || ENCODER_VCEENC || ENCODER_MPP)
 #define ENABLE_VPP_FILTER_DEBAND (ENCODER_QSV || ENCODER_NVENC || ENCODER_VCEENC || ENCODER_MPP || CLFILTERS_AUF)
-#define ENABLE_VPP_FILTER_DELOGO_MULTIADD (  ENCODER_NVENC)
+#define ENABLE_VPP_FILTER_DELOGO_MULTIADD ( ENCODER_NVENC)
 
 static const TCHAR* VMAF_DEFAULT_MODEL_VERSION = _T("vmaf_v0.6.1");
 
@@ -111,7 +110,7 @@ static const bool FILTER_DEFAULT_AFS_DROP = false;
 static const bool FILTER_DEFAULT_AFS_SMOOTH = false;
 static const bool FILTER_DEFAULT_AFS_FORCE24 = false;
 static const bool FILTER_DEFAULT_AFS_TUNE = false;
-static const bool FILTER_DEFAULT_AFS_RFF = false;
+static const bool FILTER_DEFAULT_AFS_RFF = true;
 static const int FILTER_DEFAULT_AFS_TIMECODE = 0;
 static const bool FILTER_DEFAULT_AFS_LOG = false;