Remove deprecated av1_assign_q_and_bounds_q_mode()
The functionality has been covered by the new rc estimate flow.
Remove the deprecated function. No coding stats changed.
Change-Id: I4665917b8b3bfca8113941469c7be77ae71816d0
diff --git a/av1/encoder/pass2_strategy.c b/av1/encoder/pass2_strategy.c
index 1c6a2ee..eb74fb6 100644
--- a/av1/encoder/pass2_strategy.c
+++ b/av1/encoder/pass2_strategy.c
@@ -744,49 +744,6 @@
#endif // GROUP_ADAPTIVE_MAXQ
#define MIN_FWD_KF_INTERVAL 8
-void av1_assign_q_and_bounds_q_mode(AV1_COMP *cpi) {
- AV1_COMMON *const cm = &cpi->common;
- GF_GROUP *const gf_group = &cpi->gf_group;
- const int width = cm->width;
- const int height = cm->height;
- RATE_CONTROL *const rc = &cpi->rc;
- const int last_boosted_q = rc->last_boosted_qindex;
- const int last_kf_q = rc->last_kf_qindex;
- const int avg_frame_qindex = rc->avg_frame_qindex[INTER_FRAME];
- int q;
-
- for (int cur_index = 0; cur_index < gf_group->size; ++cur_index) {
- const FRAME_UPDATE_TYPE cur_update_type = gf_group->update_type[cur_index];
- int arf_q = -1; // Initialize to invalid value, for sanity check later.
-
- q = av1_estimate_q_constant_quality_two_pass(cpi, width, height, &arf_q,
- cur_index);
- if (cur_update_type == ARF_UPDATE) {
- cpi->rc.arf_q = arf_q;
- }
- gf_group->q_val[cur_index] = q;
-
- // Update the rate control state necessary to accuratly compute q for
- // the next frames.
- // This is used to help set quality in forced key frames to reduce popping
- if ((q < rc->last_boosted_qindex) || (cur_update_type == KF_UPDATE) ||
- (!rc->constrained_gf_group && (cur_update_type == ARF_UPDATE ||
- cur_update_type == INTNL_ARF_UPDATE ||
- cur_update_type == GF_UPDATE))) {
- rc->last_boosted_qindex = q;
- }
- // TODO(sarahparker) Investigate whether or not this is actually needed
- if (cur_update_type == LF_UPDATE)
- rc->avg_frame_qindex[INTER_FRAME] =
- ROUND_POWER_OF_TWO(3 * rc->avg_frame_qindex[INTER_FRAME] + q, 2);
- if (cur_update_type == KF_UPDATE) rc->last_kf_qindex = q;
- }
- // Reset all of the modified state to the original values.
- rc->last_boosted_qindex = last_boosted_q;
- rc->last_kf_qindex = last_kf_q;
- rc->avg_frame_qindex[INTER_FRAME] = avg_frame_qindex;
-}
-
static void define_gf_group_pass0(AV1_COMP *cpi,
const EncodeFrameParams *const frame_params) {
RATE_CONTROL *const rc = &cpi->rc;
@@ -808,8 +765,6 @@
// Set up the structure of this Group-Of-Pictures (same as GF_GROUP)
av1_gop_setup_structure(cpi, frame_params);
- if (cpi->oxcf.rc_mode == AOM_Q) av1_assign_q_and_bounds_q_mode(cpi);
-
// Allocate bits to each of the frames in the GF group.
// TODO(sarahparker) Extend this to work with pyramid structure.
for (int cur_index = 0; cur_index < gf_group->size; ++cur_index) {
@@ -1244,8 +1199,6 @@
// Set up the structure of this Group-Of-Pictures (same as GF_GROUP)
av1_gop_setup_structure(cpi, frame_params);
- if (cpi->oxcf.rc_mode == AOM_Q) av1_assign_q_and_bounds_q_mode(cpi);
-
// Allocate bits to each of the frames in the GF group.
allocate_gf_group_bits(cpi, gf_group_bits, gf_group_error_left, gf_arf_bits,
frame_params);
diff --git a/av1/encoder/pass2_strategy.h b/av1/encoder/pass2_strategy.h
index dc52253..bf37746 100644
--- a/av1/encoder/pass2_strategy.h
+++ b/av1/encoder/pass2_strategy.h
@@ -27,8 +27,6 @@
void av1_twopass_postencode_update(struct AV1_COMP *cpi);
-void av1_assign_q_and_bounds_q_mode(AV1_COMP *cpi);
-
#ifdef __cplusplus
} // extern "C"
#endif
