Remove obsolete control AOME_SET_ARNR_TYPE and command line flag

The control is deprecated and is a noop.

Change-Id: I66f248485a906c26205a1b26e61e15d976207fd8

aom/aomcx.h

@@ -181,12 +181,9 @@ enum aome_enc_control_id {
    */
   AOME_SET_ARNR_STRENGTH,
 
-  /*!\deprecated control function to set the filter type to use for the arf. */
-  AOME_SET_ARNR_TYPE,
-
   /*!\brief Codec control function to set visual tuning.
    */
-  AOME_SET_TUNING,
+  AOME_SET_TUNING = AOME_SET_ARNR_STRENGTH + 2,
 
   /*!\brief Codec control function to set constrained quality level.
    *
@@ -556,8 +553,6 @@ AOM_CTRL_USE_TYPE(AOME_SET_ARNR_MAXFRAMES, unsigned int)
 #define AOM_CTRL_AOME_SET_ARNR_MAXFRAMES
 AOM_CTRL_USE_TYPE(AOME_SET_ARNR_STRENGTH, unsigned int)
 #define AOM_CTRL_AOME_SET_ARNR_STRENGTH
-AOM_CTRL_USE_TYPE_DEPRECATED(AOME_SET_ARNR_TYPE, unsigned int)
-#define AOM_CTRL_AOME_SET_ARNR_TYPE
 AOM_CTRL_USE_TYPE(AOME_SET_TUNING, int) /* aom_tune_metric */
 #define AOM_CTRL_AOME_SET_TUNING
 AOM_CTRL_USE_TYPE(AOME_SET_CQ_LEVEL, unsigned int)

aomenc.c

@@ -358,7 +358,6 @@ static const arg_def_t arnr_maxframes =
     ARG_DEF(NULL, "arnr-maxframes", 1, "AltRef max frames (0..15)");
 static const arg_def_t arnr_strength =
     ARG_DEF(NULL, "arnr-strength", 1, "AltRef filter strength (0..6)");
-static const arg_def_t arnr_type = ARG_DEF(NULL, "arnr-type", 1, "AltRef type");
 static const struct arg_enum_list tuning_enum[] = {
   { "psnr", AOM_TUNE_PSNR }, { "ssim", AOM_TUNE_SSIM }, { NULL, 0 }
 };
@@ -471,7 +470,6 @@ static const arg_def_t *av1_args[] = { &cpu_used_av1,
                                        &tile_rows,
                                        &arnr_maxframes,
                                        &arnr_strength,
-                                       &arnr_type,
                                        &tune_ssim,
                                        &cq_level,
                                        &max_intra_rate_pct,
@@ -511,7 +509,6 @@ static const int av1_arg_ctrl_map[] = { AOME_SET_CPUUSED,
                                         AV1E_SET_TILE_ROWS,
                                         AOME_SET_ARNR_MAXFRAMES,
                                         AOME_SET_ARNR_STRENGTH,
-                                        AOME_SET_ARNR_TYPE,
                                         AOME_SET_TUNING,
                                         AOME_SET_CQ_LEVEL,
                                         AOME_SET_MAX_INTRA_BITRATE_PCT,

av1/av1_cx_iface.c

@@ -659,13 +659,6 @@ static aom_codec_err_t ctrl_set_arnr_strength(aom_codec_alg_priv_t *ctx,
   return update_extra_cfg(ctx, &extra_cfg);
 }
 
-static aom_codec_err_t ctrl_set_arnr_type(aom_codec_alg_priv_t *ctx,
-                                          va_list args) {
-  (void)ctx;
-  (void)args;
-  return AOM_CODEC_OK;
-}
-
 static aom_codec_err_t ctrl_set_tuning(aom_codec_alg_priv_t *ctx,
                                        va_list args) {
   struct av1_extracfg extra_cfg = ctx->extra_cfg;
@@ -1338,7 +1331,6 @@ static aom_codec_ctrl_fn_map_t encoder_ctrl_maps[] = {
   { AV1E_SET_TILE_ROWS, ctrl_set_tile_rows },
   { AOME_SET_ARNR_MAXFRAMES, ctrl_set_arnr_max_frames },
   { AOME_SET_ARNR_STRENGTH, ctrl_set_arnr_strength },
-  { AOME_SET_ARNR_TYPE, ctrl_set_arnr_type },
   { AOME_SET_TUNING, ctrl_set_tuning },
   { AOME_SET_CQ_LEVEL, ctrl_set_cq_level },
   { AOME_SET_MAX_INTRA_BITRATE_PCT, ctrl_set_rc_max_intra_bitrate_pct },

test/arf_freq_test.cc

@@ -154,7 +154,6 @@ class ArfFreqTestLarge
         encoder->Control(AOME_SET_ENABLEAUTOALTREF, 1);
         encoder->Control(AOME_SET_ARNR_MAXFRAMES, 7);
         encoder->Control(AOME_SET_ARNR_STRENGTH, 5);
-        encoder->Control(AOME_SET_ARNR_TYPE, 3);
       }
     }
   }

test/borders_test.cc

@@ -38,7 +38,6 @@ class BordersTest
       encoder->Control(AOME_SET_ENABLEAUTOALTREF, 1);
       encoder->Control(AOME_SET_ARNR_MAXFRAMES, 7);
       encoder->Control(AOME_SET_ARNR_STRENGTH, 5);
-      encoder->Control(AOME_SET_ARNR_TYPE, 3);
     }
   }
 

test/cpu_speed_test.cc

@@ -53,7 +53,6 @@ class CpuSpeedTest
         encoder->Control(AOME_SET_ENABLEAUTOALTREF, 1);
         encoder->Control(AOME_SET_ARNR_MAXFRAMES, 7);
         encoder->Control(AOME_SET_ARNR_STRENGTH, 5);
-        encoder->Control(AOME_SET_ARNR_TYPE, 3);
       }
     }
   }

test/encoder_parms_get_to_decoder.cc

@@ -89,7 +89,6 @@ class AvxEncoderParmsGetToDecoder
       encoder->Control(AOME_SET_ENABLEAUTOALTREF, 1);
       encoder->Control(AOME_SET_ARNR_MAXFRAMES, 7);
       encoder->Control(AOME_SET_ARNR_STRENGTH, 5);
-      encoder->Control(AOME_SET_ARNR_TYPE, 3);
       if (encode_parms.render_size[0] > 0 && encode_parms.render_size[1] > 0)
         encoder->Control(AV1E_SET_RENDER_SIZE, encode_parms.render_size);
     }

test/end_to_end_test.cc

@@ -140,7 +140,6 @@ class EndToEndTestLarge
         encoder->Control(AOME_SET_ENABLEAUTOALTREF, 1);
         encoder->Control(AOME_SET_ARNR_MAXFRAMES, 7);
         encoder->Control(AOME_SET_ARNR_STRENGTH, 5);
-        encoder->Control(AOME_SET_ARNR_TYPE, 3);
       }
     }
   }

test/ethread_test.cc

@@ -88,7 +88,6 @@ class AVxEncoderThreadTest
         encoder->Control(AOME_SET_ENABLEAUTOALTREF, 1);
         encoder->Control(AOME_SET_ARNR_MAXFRAMES, 7);
         encoder->Control(AOME_SET_ARNR_STRENGTH, 5);
-        encoder->Control(AOME_SET_ARNR_TYPE, 3);
         encoder->Control(AV1E_SET_FRAME_PARALLEL_DECODING, 0);
       } else {
         encoder->Control(AOME_SET_ENABLEAUTOALTREF, 0);

test/frame_size_tests.cc

@@ -40,7 +40,6 @@ class AV1FrameSizeTestsLarge : public ::libaom_test::EncoderTest,
       encoder->Control(AOME_SET_ENABLEAUTOALTREF, 1);
       encoder->Control(AOME_SET_ARNR_MAXFRAMES, 7);
       encoder->Control(AOME_SET_ARNR_STRENGTH, 5);
-      encoder->Control(AOME_SET_ARNR_TYPE, 3);
     }
   }
 

test/level_test.cc

@@ -53,7 +53,6 @@ class LevelTest
         encoder->Control(AOME_SET_ENABLEAUTOALTREF, 1);
         encoder->Control(AOME_SET_ARNR_MAXFRAMES, 7);
         encoder->Control(AOME_SET_ARNR_STRENGTH, 5);
-        encoder->Control(AOME_SET_ARNR_TYPE, 3);
       }
     }
     encoder->Control(AV1E_GET_LEVEL, &level_);