[VP] EDSR refactor

EDSR refactor

Change-Id: I5ceb25bcb7899cabc1b77bd76d6539d59f79a28d
diff --git a/media_driver/agnostic/common/os/mos_utilities.c b/media_driver/agnostic/common/os/mos_utilities.c
index 31acd10..d04c70b 100644
--- a/media_driver/agnostic/common/os/mos_utilities.c
+++ b/media_driver/agnostic/common/os/mos_utilities.c
@@ -3088,6 +3088,24 @@
         MOS_USER_FEATURE_VALUE_TYPE_UINT32,
         "0",
         "For debugging purpose. 0 is to use default setting, 1 means FP32 mode, 2 means Hybrid mode, 3 means FP16 mode"),
+    MOS_DECLARE_UF_KEY(__VPHAL_ENABLE_SUPER_RESOLUTION_EDSR_ID,
+        "Enable VP Super Resolution EDSR",
+        __MEDIA_USER_FEATURE_SUBKEY_INTERNAL,
+        __MEDIA_USER_FEATURE_SUBKEY_REPORT,
+        "VP",
+        MOS_USER_FEATURE_TYPE_USER,
+        MOS_USER_FEATURE_VALUE_TYPE_BOOL,
+        "0",
+        "For debugging purpose. true for enabling VPP super resolution EDSR scaling"),
+    MOS_DECLARE_UF_KEY(__VPHAL_SUPER_RESOLUTION_EDSR_MODE_ID,
+        "Super Resolution EDSR Mode",
+        __MEDIA_USER_FEATURE_SUBKEY_INTERNAL,
+        __MEDIA_USER_FEATURE_SUBKEY_REPORT,
+        "VP",
+        MOS_USER_FEATURE_TYPE_USER,
+        MOS_USER_FEATURE_VALUE_TYPE_UINT32,
+        "0",
+        "For debugging purpose. 0 is to use default setting, 1 means 20 channels, 2 means 24 channels, 3 means 25 channels"),
     MOS_DECLARE_UF_KEY_DBGONLY(__MEDIA_USER_FEATURE_VALUE_SUPER_RESOLUTION_ENABLE_ID,
         "SuperResolutionEnable",
         __MEDIA_USER_FEATURE_SUBKEY_INTERNAL,
diff --git a/media_driver/agnostic/common/os/mos_utilities_common.h b/media_driver/agnostic/common/os/mos_utilities_common.h
index e4f9435..a31c174 100644
--- a/media_driver/agnostic/common/os/mos_utilities_common.h
+++ b/media_driver/agnostic/common/os/mos_utilities_common.h
@@ -442,6 +442,8 @@
     __VPHAL_VEBOX_DISABLE_TEMPORAL_DENOISE_FILTER_ID,
     __VPHAL_ENABLE_SUPER_RESOLUTION_ID,
     __VPHAL_SUPER_RESOLUTION_MODE_ID,
+    __VPHAL_ENABLE_SUPER_RESOLUTION_EDSR_ID,
+    __VPHAL_SUPER_RESOLUTION_EDSR_MODE_ID,
 #if (_DEBUG || _RELEASE_INTERNAL)
     __VPHAL_COMP_8TAP_ADAPTIVE_ENABLE_ID,
     __VPHAL_RNDR_FORCE_VP_DECOMPRESSED_OUTPUT_ID,