Correct references to RATE_CONTROL
The following CL:
https://aomedia-review.googlesource.com/c/aom/+/135325
introduced some incorrect references to elements that were
not moved to PRIMARY_RATE_CONTROL. This commit corrects those
references.
Change-Id: I2ba525dbbfba94892dad00d6227dfa6275a56592
diff --git a/av1/encoder/encoder_utils.c b/av1/encoder/encoder_utils.c
index 4cc9de2..329635c 100644
--- a/av1/encoder/encoder_utils.c
+++ b/av1/encoder/encoder_utils.c
@@ -1305,7 +1305,7 @@
current_frame->frame_number, cpi->gf_frame_index,
cpi->ppi->gf_group.update_type[cpi->gf_frame_index],
current_frame->order_hint, cm->show_frame, cm->show_existing_frame,
- cpi->p_rc.source_alt_ref_active, cpi->refresh_frame.alt_ref_frame,
+ cpi->rc.source_alt_ref_active, cpi->refresh_frame.alt_ref_frame,
recon_buf->y_stride, recon_buf->uv_stride, cm->width, cm->height);
#if 0
int ref_frame;
diff --git a/av1/encoder/pass2_strategy.c b/av1/encoder/pass2_strategy.c
index 042bf9e..1b2ca45 100644
--- a/av1/encoder/pass2_strategy.c
+++ b/av1/encoder/pass2_strategy.c
@@ -3818,8 +3818,8 @@
++arf_count;
fprintf(fpfile, "%10d %10d %10d %10d %10d\n",
cpi->common.current_frame.frame_number,
- p_rc->frames_till_gf_update_due, cpi->ppi->p_rc.kf_boost,
- arf_count, p_rc->gfu_boost);
+ rc->frames_till_gf_update_due, cpi->ppi->p_rc.kf_boost, arf_count,
+ p_rc->gfu_boost);
fclose(fpfile);
}
@@ -4004,9 +4004,9 @@
fprintf(fpfile,
"%10d %10d %10d %10" PRId64 " %10" PRId64
" %10d %10d %10d %10.4lf %10.4lf %10.4lf %10.4lf\n",
- cm->current_frame.frame_number, p_rc->base_frame_target,
- p_rc->projected_frame_size, p_rc->total_actual_bits,
- p_rc->vbr_bits_off_target, p_rc->rate_error_estimate,
+ cm->current_frame.frame_number, rc->base_frame_target,
+ rc->projected_frame_size, rc->total_actual_bits,
+ rc->vbr_bits_off_target, rc->rate_error_estimate,
twopass->rolling_arf_group_target_bits,
twopass->rolling_arf_group_actual_bits,
(double)twopass->rolling_arf_group_actual_bits /
@@ -4014,7 +4014,7 @@
twopass->bpm_factor,
av1_convert_qindex_to_q(cpi->common.quant_params.base_qindex,
cm->seq_params.bit_depth),
- av1_convert_qindex_to_q(p_rc->active_worst_quality,
+ av1_convert_qindex_to_q(rc->active_worst_quality,
cm->seq_params.bit_depth));
fclose(fpfile);
}
diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index 20af42f..347e24d 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -1297,11 +1297,11 @@
int height, int *bottom_index,
int *top_index) {
const AV1_COMMON *const cm = &cpi->common;
- const RATE_CONTROL *const p_rc = &cpi->p_rc;
+ const RATE_CONTROL *const rc = &cpi->rc;
const AV1EncoderConfig *const oxcf = &cpi->oxcf;
const int cq_level =
- get_active_cq_level(p_rc, oxcf, frame_is_intra_only(cm),
- cpi->superres_mode, cm->superres_scale_denominator);
+ get_active_cq_level(rc, oxcf, frame_is_intra_only(cm), cpi->superres_mode,
+ cm->superres_scale_denominator);
const int bit_depth = cm->seq_params.bit_depth;
const int q = (int)av1_convert_qindex_to_q(cq_level, bit_depth);
(void)width;
@@ -2096,7 +2096,7 @@
}
if (target > INT_MAX) target = INT_MAX;
#else
- target = p_rc->avg_frame_bandwidth;
+ target = rc->avg_frame_bandwidth;
#endif
return av1_rc_clamp_pframe_target_size(cpi, (int)target, frame_update_type);
}
