Merge "[spatial svc] Remove encoding modes since we only need one mode at this time."

diff --cc examples/vp9_spatial_svc_encoder.c
index 708ddda705da8e030973c5d08c3dbad3cb2b8162,a4cbd456033326f0fb4ec29fdb886a18194d01f2..223f37eb5526cc1640503d227216a745ebd220b2
--- 1/examples/vp9_spatial_svc_encoder.c
--- 2/examples/vp9_spatial_svc_encoder.c
+++ b/examples/vp9_spatial_svc_encoder.c
@@@ -74,15 -67,14 +64,13 @@@ static const arg_def_t max_bitrate_arg 
      ARG_DEF(NULL, "max-bitrate", 1, "Maximum bitrate");
  
  static const arg_def_t *svc_args[] = {
-   &encoding_mode_arg, &frames_arg,        &width_arg,       &height_arg,
+   &frames_arg,        &width_arg,         &height_arg,
    &timebase_arg,      &bitrate_arg,       &skip_frames_arg, &layers_arg,
 -  &kf_dist_arg,       &scale_factors_arg, &quantizers_arg,
 -  &quantizers_keyframe_arg,               &passes_arg,      &pass_arg,
 -  &fpf_name_arg,      &min_q_arg,         &max_q_arg,       &min_bitrate_arg,
 -  &max_bitrate_arg,   NULL
 +  &kf_dist_arg,       &scale_factors_arg, &quantizers_arg,  &passes_arg,
 +  &pass_arg,          &fpf_name_arg,      &min_q_arg,       &max_q_arg,
 +  &min_bitrate_arg,   &max_bitrate_arg,   NULL
  };
  
- static const SVC_ENCODING_MODE default_encoding_mode =
-     INTER_LAYER_PREDICTION_IP;
  static const uint32_t default_frames_to_skip = 0;
  static const uint32_t default_frames_to_code = 60 * 60;
  static const uint32_t default_width = 1920;

diff --cc test/svc_test.cc
Simple merge

diff --cc vpx/src/svc_encodeframe.c
index 8cf003b36bb70c44814ae7ec022f8d738e222065,8a9dfeda46f8216fa5608ddf105f9dea47124f19..6c15f6ef993ae727e68e0e764cd6e266f176d912
--- 1/vpx/src/svc_encodeframe.c
--- 2/vpx/src/svc_encodeframe.c
+++ b/vpx/src/svc_encodeframe.c
@@@ -194,25 -197,9 +194,8 @@@ static int svc_log(SvcContext *svc_ctx
    return retval;
  }
  
- static vpx_codec_err_t set_option_encoding_mode(SvcContext *svc_ctx,
-                                                 const char *value_str) {
-   if (strcmp(value_str, "i") == 0) {
-     svc_ctx->encoding_mode = INTER_LAYER_PREDICTION_I;
-   } else if (strcmp(value_str, "alt-ip") == 0) {
-     svc_ctx->encoding_mode = ALT_INTER_LAYER_PREDICTION_IP;
-   } else if (strcmp(value_str, "ip") == 0) {
-     svc_ctx->encoding_mode = INTER_LAYER_PREDICTION_IP;
-   } else if (strcmp(value_str, "gf") == 0) {
-     svc_ctx->encoding_mode = USE_GOLDEN_FRAME;
-   } else {
-     svc_log(svc_ctx, SVC_LOG_ERROR, "invalid encoding mode: %s", value_str);
-     return VPX_CODEC_INVALID_PARAM;
-   }
-   return VPX_CODEC_OK;
- }
- 
  static vpx_codec_err_t parse_quantizer_values(SvcContext *svc_ctx,
 -                                              const char *quantizer_values,
 -                                              const int is_keyframe) {
 +                                              const char *quantizer_values) {
    char *input_string;
    char *token;
    const char *delim = ",";

diff --cc vpx/svc_context.h
Simple merge