commit a9132abb53b4ec48acb1683f8e33b64e3b116cce
author Wan-Teh Chang <wtc@google.com> Thu Apr 22 10:11:20 2021 -0700
committer Wan-Teh Chang <wtc@google.com> Thu Apr 22 19:28:44 2021 +0000
tree f5564aad5d916b99ee35295d359fc14cf24993ae
parent eecc7370ba387582fc42077de96f8d93c63e4ad3

Remove ksvc_fixed_mode from aom_svc_params_t

Remove the ksvc_fixed_mode field from the aom_svc_params_t struct. The
aom_svc_params_t struct is a public struct that libaom clients allocate
and pass to aom_codec_control(AV1E_SET_SVC_PARAMS), so changing the
definition of the aom_svc_params_t struct breaks binary compatibility.

Note: This CL reverts only this part of Marco's commit:
    rtc-svc: Allow for fixed SVC modes
    https://aomedia-review.googlesource.com/c/aom/+/133868
The rest of that commit is preserved.

BUG=aomedia:3032

Change-Id: I69a0a339333f8302c18f8e25f49c0cd4840a174b
(cherry picked from commit 51c6def1096fb15df3bb1eabf1986a57f0b2deca)

aom/aomcx.h

diff --git a/aom/aomcx.h b/aom/aomcx.h
index 8b9a398..b4eeeb1 100644
--- a/aom/aomcx.h
+++ b/aom/aomcx.h
@@ -1449,8 +1449,6 @@
   int layer_target_bitrate[AOM_MAX_LAYERS];
   /*! Frame rate factor for each temporal layer */
   int framerate_factor[AOM_MAX_TS_LAYERS];
-  /*! Flag to do KSVC for fixed mode */
-  int ksvc_fixed_mode;
 } aom_svc_params_t;
 
 /*!brief Parameters for setting ref frame config */

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index f5ddbe4..13456b2 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -2689,7 +2689,6 @@
   cm->number_temporal_layers = params->number_temporal_layers;
   cpi->svc.number_spatial_layers = params->number_spatial_layers;
   cpi->svc.number_temporal_layers = params->number_temporal_layers;
-  cpi->svc.ksvc_fixed_mode = params->ksvc_fixed_mode;
   if (cm->number_spatial_layers > 1 || cm->number_temporal_layers > 1) {
     unsigned int sl, tl;
     cpi->use_svc = 1;

examples/svc_encoder_rtc.c

diff --git a/examples/svc_encoder_rtc.c b/examples/svc_encoder_rtc.c
index 17456d8..4eaab5d 100644
--- a/examples/svc_encoder_rtc.c
+++ b/examples/svc_encoder_rtc.c
@@ -1267,8 +1267,8 @@
     svc_params.scaling_factor_num[1] = 1;
     svc_params.scaling_factor_den[1] = 2;
   }
-  svc_params.ksvc_fixed_mode = 0;  // Set to 1 to do KSVC in fixed mode.
   aom_codec_control(&codec, AV1E_SET_SVC_PARAMS, &svc_params);
+  // TODO(aomedia:3032): Configure KSVC in fixed mode.
 
   // This controls the maximum target size of the key frame.
   // For generating smaller key frames, use a smaller max_intra_size_pct

test/svc_datarate_test.cc

diff --git a/test/svc_datarate_test.cc b/test/svc_datarate_test.cc
index 8d7376a..85e9594 100644
--- a/test/svc_datarate_test.cc
+++ b/test/svc_datarate_test.cc
@@ -89,6 +89,7 @@
       initialize_svc(number_temporal_layers_, number_spatial_layers_,
                      &svc_params_);
       encoder->Control(AV1E_SET_SVC_PARAMS, &svc_params_);
+      // TODO(aomedia:3032): Configure KSVC in fixed mode.
       encoder->Control(AV1E_SET_ENABLE_ORDER_HINT, 0);
       encoder->Control(AV1E_SET_ENABLE_TPL_MODEL, 0);
       encoder->Control(AV1E_SET_DELTAQ_MODE, 0);