Move ref_frame_comp from aom_svc_ref_frame_config
Move the ref_frame_comp array from struct aom_svc_ref_frame_config to
the new struct aom_svc_ref_frame_comp_pred and rename it use_comp_pred.
Since struct aom_svc_ref_frame_config is public, libaom clients can
allocate this struct and pass the address of the struct to libaom.
Therefore, adding a new member to this struct will break compatibility
with libaom client binaries that were compiled against an older version
of libaom. By moving the array to a new struct we can maintain
compatibility with older versions of libaom.
BUG=aomedia:3150
Change-Id: I8868994b9a0b426abf6cb69ffa343f7345415328
diff --git a/aom/aomcx.h b/aom/aomcx.h
index b1b12d8..9a2287b 100644
--- a/aom/aomcx.h
+++ b/aom/aomcx.h
@@ -1372,6 +1372,11 @@
*/
AV1E_SET_ENABLE_TX_SIZE_SEARCH = 146,
+ /*!\brief Codec control function to set reference frame compound prediction.
+ * aom_svc_ref_frame_comp_pred_t* parameter
+ */
+ AV1E_SET_SVC_REF_FRAME_COMP_PRED = 147,
+
// Any new encoder control IDs should be added above.
// Maximum allowed encoder control ID is 229.
// No encoder control ID should be added below.
@@ -1504,10 +1509,14 @@
/*! Buffer slot index for each of 7 references. */
int ref_idx[7];
int refresh[8]; /**< Refresh flag for each of the 8 slots. */
+} aom_svc_ref_frame_config_t;
+
+/*!brief Parameters for setting ref frame compound prediction */
+typedef struct aom_svc_ref_frame_comp_pred {
// Use compound prediction for the ref_frame pairs GOLDEN_LAST (0),
// LAST2_LAST (1), and ALTREF_LAST (2).
- int ref_frame_comp[3]; /**<Compound reference flag. */
-} aom_svc_ref_frame_config_t;
+ int use_comp_pred[3]; /**<Compound reference flag. */
+} aom_svc_ref_frame_comp_pred_t;
/*!\cond */
/*!\brief Encoder control function parameter type
@@ -1923,6 +1932,10 @@
AOM_CTRL_USE_TYPE(AV1E_SET_ENABLE_TX_SIZE_SEARCH, int)
#define AOM_CTRL_AV1E_SET_ENABLE_TX_SIZE_SEARCH
+AOM_CTRL_USE_TYPE(AV1E_SET_SVC_REF_FRAME_COMP_PRED,
+ aom_svc_ref_frame_comp_pred_t *)
+#define AOME_CTRL_AV1E_SET_SVC_REF_FRAME_COMP_PRED
+
/*!\endcond */
/*! @} - end defgroup aom_encoder */
#ifdef __cplusplus
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 54a275b..62ea28d 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -3255,14 +3255,22 @@
}
for (unsigned int i = 0; i < REF_FRAMES; ++i)
cpi->svc.refresh[i] = data->refresh[i];
- cpi->svc.ref_frame_comp[0] = data->ref_frame_comp[0];
- cpi->svc.ref_frame_comp[1] = data->ref_frame_comp[1];
- cpi->svc.ref_frame_comp[2] = data->ref_frame_comp[2];
cpi->svc.use_flexible_mode = 1;
cpi->svc.ksvc_fixed_mode = 0;
return AOM_CODEC_OK;
}
+static aom_codec_err_t ctrl_set_svc_ref_frame_comp_pred(
+ aom_codec_alg_priv_t *ctx, va_list args) {
+ AV1_COMP *const cpi = ctx->ppi->cpi;
+ aom_svc_ref_frame_comp_pred_t *const data =
+ va_arg(args, aom_svc_ref_frame_comp_pred_t *);
+ cpi->svc.ref_frame_comp[0] = data->use_comp_pred[0];
+ cpi->svc.ref_frame_comp[1] = data->use_comp_pred[1];
+ cpi->svc.ref_frame_comp[2] = data->use_comp_pred[2];
+ return AOM_CODEC_OK;
+}
+
static aom_codec_err_t ctrl_set_tune_content(aom_codec_alg_priv_t *ctx,
va_list args) {
struct av1_extracfg extra_cfg = ctx->extra_cfg;
@@ -3901,6 +3909,7 @@
{ AV1E_SET_SVC_LAYER_ID, ctrl_set_layer_id },
{ AV1E_SET_SVC_PARAMS, ctrl_set_svc_params },
{ AV1E_SET_SVC_REF_FRAME_CONFIG, ctrl_set_svc_ref_frame_config },
+ { AV1E_SET_SVC_REF_FRAME_COMP_PRED, ctrl_set_svc_ref_frame_comp_pred },
{ AV1E_SET_VBR_CORPUS_COMPLEXITY_LAP, ctrl_set_vbr_corpus_complexity_lap },
{ AV1E_ENABLE_SB_MULTIPASS_UNIT_TEST, ctrl_enable_sb_multipass_unit_test },
{ AV1E_SET_DV_COST_UPD_FREQ, ctrl_set_dv_cost_upd_freq },
diff --git a/examples/svc_encoder_rtc.c b/examples/svc_encoder_rtc.c
index 745468a..e2da3ae 100644
--- a/examples/svc_encoder_rtc.c
+++ b/examples/svc_encoder_rtc.c
@@ -556,11 +556,11 @@
}
// Layer pattern configuration.
-static void set_layer_pattern(int layering_mode, int superframe_cnt,
- aom_svc_layer_id_t *layer_id,
- aom_svc_ref_frame_config_t *ref_frame_config,
- int *use_svc_control, int spatial_layer_id,
- int is_key_frame, int ksvc_mode, int speed) {
+static void set_layer_pattern(
+ int layering_mode, int superframe_cnt, aom_svc_layer_id_t *layer_id,
+ aom_svc_ref_frame_config_t *ref_frame_config,
+ aom_svc_ref_frame_comp_pred_t *ref_frame_comp_pred, int *use_svc_control,
+ int spatial_layer_id, int is_key_frame, int ksvc_mode, int speed) {
int i;
int enable_longterm_temporal_ref = 1;
int shift = (layering_mode == 8) ? 2 : 0;
@@ -568,9 +568,9 @@
layer_id->spatial_layer_id = spatial_layer_id;
int lag_index = 0;
int base_count = superframe_cnt >> 2;
- ref_frame_config->ref_frame_comp[0] = 0; // GOLDEN_LAST
- ref_frame_config->ref_frame_comp[1] = 0; // LAST2_LAST
- ref_frame_config->ref_frame_comp[2] = 0; // ALTREF_LAST
+ ref_frame_comp_pred->use_comp_pred[0] = 0; // GOLDEN_LAST
+ ref_frame_comp_pred->use_comp_pred[1] = 0; // LAST2_LAST
+ ref_frame_comp_pred->use_comp_pred[2] = 0; // ALTREF_LAST
// Set the reference map buffer idx for the 7 references:
// LAST_FRAME (0), LAST2_FRAME(1), LAST3_FRAME(2), GOLDEN_FRAME(3),
// BWDREF_FRAME(4), ALTREF2_FRAME(5), ALTREF_FRAME(6).
@@ -686,7 +686,7 @@
ref_frame_config->reference[SVC_GOLDEN_FRAME] = 1;
ref_frame_config->reference[SVC_ALTREF_FRAME] = 1;
// Allow for compound prediction using LAST and ALTREF.
- if (speed >= 7) ref_frame_config->ref_frame_comp[2] = 1;
+ if (speed >= 7) ref_frame_comp_pred->use_comp_pred[2] = 1;
break;
case 4:
// 3-temporal layer: but middle layer updates GF, so 2nd TL2 will
@@ -1080,6 +1080,7 @@
aom_svc_layer_id_t layer_id;
aom_svc_params_t svc_params;
aom_svc_ref_frame_config_t ref_frame_config;
+ aom_svc_ref_frame_comp_pred_t ref_frame_comp_pred;
#if CONFIG_INTERNAL_STATS
FILE *stats_file = fopen("opsnr.stt", "a");
@@ -1310,13 +1311,16 @@
// Set the reference/update flags, layer_id, and reference_map
// buffer index.
set_layer_pattern(app_input.layering_mode, frame_cnt, &layer_id,
- &ref_frame_config, &use_svc_control, slx,
- is_key_frame, (app_input.layering_mode == 10),
- app_input.speed);
+ &ref_frame_config, &ref_frame_comp_pred,
+ &use_svc_control, slx, is_key_frame,
+ (app_input.layering_mode == 10), app_input.speed);
aom_codec_control(&codec, AV1E_SET_SVC_LAYER_ID, &layer_id);
- if (use_svc_control)
+ if (use_svc_control) {
aom_codec_control(&codec, AV1E_SET_SVC_REF_FRAME_CONFIG,
&ref_frame_config);
+ aom_codec_control(&codec, AV1E_SET_SVC_REF_FRAME_COMP_PRED,
+ &ref_frame_comp_pred);
+ }
} else {
// Only up to 3 temporal layers supported in fixed mode.
// Only need to set spatial and temporal layer_id: reference
diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h
index 468a41b..8c265d9 100644
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -129,6 +129,11 @@
ASSERT_EQ(AOM_CODEC_OK, res) << EncoderError();
}
+ void Control(int ctrl_id, struct aom_svc_ref_frame_comp_pred *arg) {
+ const aom_codec_err_t res = aom_codec_control(&encoder_, ctrl_id, arg);
+ ASSERT_EQ(AOM_CODEC_OK, res) << EncoderError();
+ }
+
void Control(int ctrl_id, struct aom_svc_params *arg) {
const aom_codec_err_t res = aom_codec_control(&encoder_, ctrl_id, arg);
ASSERT_EQ(AOM_CODEC_OK, res) << EncoderError();
diff --git a/test/svc_datarate_test.cc b/test/svc_datarate_test.cc
index 8aa0190..243fcc1 100644
--- a/test/svc_datarate_test.cc
+++ b/test/svc_datarate_test.cc
@@ -73,6 +73,7 @@
memset(&layer_id_, 0, sizeof(aom_svc_layer_id_t));
memset(&svc_params_, 0, sizeof(aom_svc_params_t));
memset(&ref_frame_config_, 0, sizeof(aom_svc_ref_frame_config_t));
+ memset(&ref_frame_comp_pred_, 0, sizeof(aom_svc_ref_frame_comp_pred_t));
drop_frames_ = 0;
for (int i = 0; i < 1000; i++) drop_frames_list_[i] = 1000;
decoded_nframes_ = 0;
@@ -109,14 +110,15 @@
}
// Set the reference/update flags, layer_id, and reference_map
// buffer index.
- frame_flags_ =
- set_layer_pattern(video->frame(), &layer_id_, &ref_frame_config_,
- spatial_layer_id, multi_ref_, comp_pred_);
+ frame_flags_ = set_layer_pattern(video->frame(), &layer_id_,
+ &ref_frame_config_, &ref_frame_comp_pred_,
+ spatial_layer_id, multi_ref_, comp_pred_);
encoder->Control(AV1E_SET_SVC_LAYER_ID, &layer_id_);
- // The SET_SVC_REF_FRAME_CONFIG api is for the flexible SVC mode
- // (i.e., use_fixed_mode_svc == 0).
+ // The SET_SVC_REF_FRAME_CONFIG and AV1E_SET_SVC_REF_FRAME_COMP_PRED api is
+ // for the flexible SVC mode (i.e., use_fixed_mode_svc == 0).
if (!use_fixed_mode_svc_) {
encoder->Control(AV1E_SET_SVC_REF_FRAME_CONFIG, &ref_frame_config_);
+ encoder->Control(AV1E_SET_SVC_REF_FRAME_COMP_PRED, &ref_frame_comp_pred_);
}
if (set_frame_level_er_) {
int mode =
@@ -171,10 +173,11 @@
unsigned int GetDecodedFrames() { return decoded_nframes_; }
// Layer pattern configuration.
- virtual int set_layer_pattern(int frame_cnt, aom_svc_layer_id_t *layer_id,
- aom_svc_ref_frame_config_t *ref_frame_config,
- int spatial_layer, int multi_ref,
- int comp_pred) {
+ virtual int set_layer_pattern(
+ int frame_cnt, aom_svc_layer_id_t *layer_id,
+ aom_svc_ref_frame_config_t *ref_frame_config,
+ aom_svc_ref_frame_comp_pred_t *ref_frame_comp_pred, int spatial_layer,
+ int multi_ref, int comp_pred) {
int lag_index = 0;
int base_count = frame_cnt >> 2;
layer_id->spatial_layer_id = spatial_layer;
@@ -187,9 +190,9 @@
}
for (int i = 0; i < REF_FRAMES; i++) ref_frame_config->refresh[i] = 0;
if (comp_pred) {
- ref_frame_config->ref_frame_comp[0] = 1; // GOLDEN_LAST
- ref_frame_config->ref_frame_comp[1] = 1; // LAST2_LAST
- ref_frame_config->ref_frame_comp[2] = 1; // ALTREF_LAST
+ ref_frame_comp_pred->use_comp_pred[0] = 1; // GOLDEN_LAST
+ ref_frame_comp_pred->use_comp_pred[1] = 1; // LAST2_LAST
+ ref_frame_comp_pred->use_comp_pred[2] = 1; // ALTREF_LAST
}
// Set layer_flags to 0 when using ref_frame_config->reference.
int layer_flags = 0;
@@ -1181,6 +1184,7 @@
int target_layer_bitrate_[AOM_MAX_LAYERS];
aom_svc_params_t svc_params_;
aom_svc_ref_frame_config_t ref_frame_config_;
+ aom_svc_ref_frame_comp_pred_t ref_frame_comp_pred_;
aom_svc_layer_id_t layer_id_;
double effective_datarate_tl[AOM_MAX_LAYERS];
unsigned int drop_frames_;
