Fix encoder control for dual_filter on/off

There was a duplicate symbol and a mismatch between them.
The duplicate has been removed and the bug fixed.

Change-Id: I7ba1c8dcdd30e81a6b667fa56d5b14e9710a3a83

aom/aomcx.h

diff --git a/aom/aomcx.h b/aom/aomcx.h
index 3fd7290..ca821f6 100644
--- a/aom/aomcx.h
+++ b/aom/aomcx.h
@@ -710,14 +710,6 @@
    */
   AV1E_SET_ANS_WINDOW_SIZE_LOG2,
 
-  /*!\brief Codec control function to turn on / off dual filter
-   * enabling/disabling.
-   *
-   * This will enable or disable dual filter. The default value is 1
-   *
-   */
-  AV1E_SET_ENABLE_DF,
-
   /*!\brief Codec control function to turn on / off frame order hint for a
    * few tools:
    *
@@ -1126,9 +1118,6 @@
 AOM_CTRL_USE_TYPE(AV1E_SET_TIMING_INFO_TYPE, int) /* aom_timing_info_type_t */
 #define AOM_CTRL_AV1E_SET_TIMING_INFO_TYPE
 
-AOM_CTRL_USE_TYPE(AV1E_SET_ENABLE_DF, unsigned int)
-#define AOM_CTRL_AV1E_SET_ENABLE_DF
-
 AOM_CTRL_USE_TYPE(AV1E_SET_ENABLE_ORDER_HINT, unsigned int)
 #define AOM_CTRL_AV1E_SET_ENABLE_ORDER_HINT
 

apps/aomenc.c

diff --git a/apps/aomenc.c b/apps/aomenc.c
index 558983f..d17e16f 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -808,8 +808,6 @@
                                         AV1E_SET_DENOISE_BLOCK_SIZE,
 #endif
                                         AV1E_SET_ENABLE_REF_FRAME_MVS,
-                                        AV1E_SET_ENABLE_DF,
-                                        AV1E_SET_ENABLE_SUPERRES,
                                         0 };
 #endif  // CONFIG_AV1_ENCODER
 

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 7381d61..55ce8f6 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -1048,10 +1048,10 @@
   return update_extra_cfg(ctx, &extra_cfg);
 }
 
-static aom_codec_err_t ctrl_set_enable_df(aom_codec_alg_priv_t *ctx,
-                                          va_list args) {
+static aom_codec_err_t ctrl_set_enable_dual_filter(aom_codec_alg_priv_t *ctx,
+                                                   va_list args) {
   struct av1_extracfg extra_cfg = ctx->extra_cfg;
-  extra_cfg.enable_dual_filter = CAST(AV1E_SET_ENABLE_DF, args);
+  extra_cfg.enable_dual_filter = CAST(AV1E_SET_ENABLE_DUAL_FILTER, args);
   return update_extra_cfg(ctx, &extra_cfg);
 }
 
@@ -1892,7 +1892,7 @@
   { AV1E_SET_FRAME_PARALLEL_DECODING, ctrl_set_frame_parallel_decoding_mode },
   { AV1E_SET_ERROR_RESILIENT_MODE, ctrl_set_error_resilient_mode },
   { AV1E_SET_S_FRAME_MODE, ctrl_set_s_frame_mode },
-  { AV1E_SET_ENABLE_DF, ctrl_set_enable_df },
+  { AV1E_SET_ENABLE_DUAL_FILTER, ctrl_set_enable_dual_filter },
   { AV1E_SET_ENABLE_ORDER_HINT, ctrl_set_enable_order_hint },
   { AV1E_SET_ENABLE_DIST_WTD_COMP, ctrl_set_enable_dist_wtd_comp },
   { AV1E_SET_ENABLE_REF_FRAME_MVS, ctrl_set_enable_ref_frame_mvs },