Remove USE_MANUAL_GF4_STRUCT flag.
This was for debugging purpose, and no longer required.
BUG=aomedia:2306
Change-Id: I57c042d67d152b6d378451550d019f4c1c70e25f
diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index 55c0055..d2ff61f 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -1792,136 +1792,6 @@
// It is an example of how to define a GF stucture manually. The function will
// result in exactly the same GF group structure as
// define_customized_gf_group_structure() when rc->baseline_gf_interval == 4
-#if USE_MANUAL_GF4_STRUCT
-#define GF_INTERVAL_4 4
-static const unsigned char gf4_multi_layer_params[][GF_FRAME_PARAMS] = {
- {
- // gf_group->index == 0 (Frame 0)
- // It can also be KEY frame. Will assign the proper value
- // in define_gf_group_structure
- OVERLAY_UPDATE, // update_type (default value)
- 0, // arf_src_offset
- 0, // arf_pos_in_gf
- 0 // arf_update_idx
- },
- {
- // gf_group->index == 1 (Frame 4)
- ARF_UPDATE, // update_type
- GF_INTERVAL_4 - 1, // arf_src_offset
- 0, // arf_pos_in_gf
- 0 // arf_update_idx
- },
- {
- // gf_group->index == 2 (Frame 2)
- INTNL_ARF_UPDATE, // update_type
- (GF_INTERVAL_4 >> 1) - 1, // arf_src_offset
- 0, // arf_pos_in_gf
- 0 // arf_update_idx
- },
- {
- // gf_group->index == 3 (Frame 1)
- LAST_BIPRED_UPDATE, // update_type
- 0, // arf_src_offset
- 0, // arf_pos_in_gf
- 0 // arf_update_idx
- },
-
- {
- // gf_group->index == 4 (Frame 2 - OVERLAY)
- INTNL_OVERLAY_UPDATE, // update_type
- 0, // arf_src_offset
- 2, // arf_pos_in_gf
- 0 // arf_update_idx
- },
- {
- // gf_group->index == 5 (Frame 3)
- LF_UPDATE, // update_type
- 0, // arf_src_offset
- 0, // arf_pos_in_gf
- 1 // arf_update_idx
- }
-};
-
-static int define_gf_group_structure_4(AV1_COMP *cpi) {
- RATE_CONTROL *const rc = &cpi->rc;
- TWO_PASS *const twopass = &cpi->twopass;
- GF_GROUP *const gf_group = &twopass->gf_group;
- const int key_frame = cpi->common.current_frame.frame_type == KEY_FRAME;
-
- assert(rc->baseline_gf_interval == GF_INTERVAL_4);
-
- const int gf_update_frames = rc->baseline_gf_interval + 2;
- int frame_index;
-
- for (frame_index = 0; frame_index < gf_update_frames; ++frame_index) {
- int param_idx = 0;
-
- gf_group->bidir_pred_enabled[frame_index] = 0;
-
- if (frame_index == 0) {
- // gf_group->arf_src_offset[frame_index] = 0;
- gf_group->brf_src_offset[frame_index] = 0;
- gf_group->bidir_pred_enabled[frame_index] = 0;
-
- // For key frames the frame target rate is already set and it
- // is also the golden frame.
- if (key_frame) continue;
-
- gf_group->update_type[frame_index] =
- gf4_multi_layer_params[frame_index][param_idx++];
-
- if (rc->source_alt_ref_active) {
- gf_group->update_type[frame_index] = OVERLAY_UPDATE;
- } else {
- gf_group->update_type[frame_index] = GF_UPDATE;
- }
- param_idx++;
- } else {
- gf_group->update_type[frame_index] =
- gf4_multi_layer_params[frame_index][param_idx++];
- }
-
- // setup other parameters
- gf_group->rf_level[frame_index] =
- update_type_2_rf_level(gf_group->update_type[frame_index]);
-
- // == arf_src_offset ==
- gf_group->arf_src_offset[frame_index] =
- gf4_multi_layer_params[frame_index][param_idx++];
-
- // == arf_pos_in_gf ==
- gf_group->arf_pos_in_gf[frame_index] =
- gf4_multi_layer_params[frame_index][param_idx++];
-
- // == arf_update_idx ==
- gf_group->brf_src_offset[frame_index] =
- gf4_multi_layer_params[frame_index][param_idx];
- }
-
- // NOTE: We need to configure the frame at the end of the sequence + 1 that
- // will be the start frame for the next group. Otherwise prior to the
- // call to av1_rc_get_second_pass_params() the data will be undefined.
- gf_group->arf_update_idx[frame_index] = 0;
- gf_group->arf_ref_idx[frame_index] = 0;
-
- if (rc->source_alt_ref_pending) {
- gf_group->update_type[frame_index] = OVERLAY_UPDATE;
- gf_group->rf_level[frame_index] = INTER_NORMAL;
-
- } else {
- gf_group->update_type[frame_index] = GF_UPDATE;
- gf_group->rf_level[frame_index] = GF_ARF_STD;
- }
-
- gf_group->bidir_pred_enabled[frame_index] = 0;
- gf_group->brf_src_offset[frame_index] = 0;
-
- // This value is only used for INTNL_OVERLAY_UPDATE
- gf_group->arf_pos_in_gf[frame_index] = 0;
-
- return gf_update_frames;
-}
-#endif // USE_MANUAL_GF4_STRUCT
static void define_gf_group_structure(AV1_COMP *cpi) {
RATE_CONTROL *const rc = &cpi->rc;
@@ -1934,12 +1804,7 @@
// used the new structure only if extra_arf is allowed
if (valid_customized_gf_length && rc->source_alt_ref_pending &&
cpi->extra_arf_allowed > 0) {
-#if USE_MANUAL_GF4_STRUCT
- if (rc->baseline_gf_interval == 4)
- define_gf_group_structure_4(cpi);
- else
-#endif
- define_customized_gf_group_structure(cpi);
+ define_customized_gf_group_structure(cpi);
cpi->new_bwdref_update_rule = 1;
return;
} else {
diff --git a/av1/encoder/ratectrl.h b/av1/encoder/ratectrl.h
index 2bad55e..c8bcaae 100644
--- a/av1/encoder/ratectrl.h
+++ b/av1/encoder/ratectrl.h
@@ -44,8 +44,6 @@
#define REDUCE_LAST_GF_LENGTH 1
#define MULTI_LVL_BOOST_VBR_CQ 1
-#define USE_MANUAL_GF4_STRUCT 0
-
#define MIN_GF_INTERVAL 4
#define MAX_GF_INTERVAL 16
#define FIXED_GF_INTERVAL 8 // Used in some testing modes only
