Differentiate 2 refresh frame parameters
refresh_frame_flags is used in both encoder and decoder to represent
refresh frame bit mask.
In encoder side, there is another parameter: cpi->refresh_frame, which
is used to store refresh frame information. In functions that use
cpi->refresh_frame, a local variable is defined as following.
const RefreshFrameFlagsInfo *const refresh_frame_flag = &cpi->refresh_frame;
To eliminate this name confusion, here we change this local variable to
be refresh_frame (i.e. use the same name as in cpi).
Change-Id: Ice65026dc823fe33dafabedc50a31229d7c17bc2
diff --git a/av1/encoder/aq_complexity.c b/av1/encoder/aq_complexity.c
index 3573b2a..37bc309 100644
--- a/av1/encoder/aq_complexity.c
+++ b/av1/encoder/aq_complexity.c
@@ -46,11 +46,11 @@
static bool is_frame_aq_enabled(const AV1_COMP *const cpi) {
const AV1_COMMON *const cm = &cpi->common;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
return frame_is_intra_only(cm) || cm->features.error_resilient_mode ||
- refresh_frame_flags->alt_ref_frame ||
- (refresh_frame_flags->golden_frame && !cpi->rc.is_src_frame_alt_ref);
+ refresh_frame->alt_ref_frame ||
+ (refresh_frame->golden_frame && !cpi->rc.is_src_frame_alt_ref);
}
// Segmentation only makes sense if the target bits per SB is above a threshold.
diff --git a/av1/encoder/aq_variance.c b/av1/encoder/aq_variance.c
index c2d0a07..60d5a77 100644
--- a/av1/encoder/aq_variance.c
+++ b/av1/encoder/aq_variance.c
@@ -43,7 +43,7 @@
void av1_vaq_frame_setup(AV1_COMP *cpi) {
AV1_COMMON *cm = &cpi->common;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
const int base_qindex = cm->quant_params.base_qindex;
struct segmentation *seg = &cm->seg;
int i;
@@ -64,8 +64,8 @@
return;
}
if (frame_is_intra_only(cm) || cm->features.error_resilient_mode ||
- refresh_frame_flags->alt_ref_frame ||
- (refresh_frame_flags->golden_frame && !cpi->rc.is_src_frame_alt_ref)) {
+ refresh_frame->alt_ref_frame ||
+ (refresh_frame->golden_frame && !cpi->rc.is_src_frame_alt_ref)) {
cpi->vaq_refresh = 1;
av1_enable_segmentation(seg);
diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index b27c434..f53b446 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -40,17 +40,18 @@
#define TEMPORAL_FILTER_KEY_FRAME (CONFIG_REALTIME_ONLY ? 0 : 1)
static INLINE void set_refresh_frame_flags(
- RefreshFrameFlagsInfo *const refresh_frame_flags, bool refresh_gf,
- bool refresh_bwdref, bool refresh_arf) {
- refresh_frame_flags->golden_frame = refresh_gf;
- refresh_frame_flags->bwd_ref_frame = refresh_bwdref;
- refresh_frame_flags->alt_ref_frame = refresh_arf;
+ RefreshFrameInfo *const refresh_frame, bool refresh_gf, bool refresh_bwdref,
+ bool refresh_arf) {
+ refresh_frame->golden_frame = refresh_gf;
+ refresh_frame->bwd_ref_frame = refresh_bwdref;
+ refresh_frame->alt_ref_frame = refresh_arf;
}
-void av1_configure_buffer_updates(
- AV1_COMP *const cpi, RefreshFrameFlagsInfo *const refresh_frame_flags,
- const FRAME_UPDATE_TYPE type, const REFBUF_STATE refbuf_state,
- int force_refresh_all) {
+void av1_configure_buffer_updates(AV1_COMP *const cpi,
+ RefreshFrameInfo *const refresh_frame,
+ const FRAME_UPDATE_TYPE type,
+ const REFBUF_STATE refbuf_state,
+ int force_refresh_all) {
// NOTE(weitinglin): Should we define another function to take care of
// cpi->rc.is_$Source_Type to make this function as it is in the comment?
const ExtRefreshFrameFlagsInfo *const ext_refresh_frame_flags =
@@ -59,22 +60,22 @@
switch (type) {
case KF_UPDATE:
- set_refresh_frame_flags(refresh_frame_flags, true, true, true);
+ set_refresh_frame_flags(refresh_frame, true, true, true);
break;
case LF_UPDATE:
- set_refresh_frame_flags(refresh_frame_flags, false, false, false);
+ set_refresh_frame_flags(refresh_frame, false, false, false);
break;
case GF_UPDATE:
- set_refresh_frame_flags(refresh_frame_flags, true, false, false);
+ set_refresh_frame_flags(refresh_frame, true, false, false);
break;
case OVERLAY_UPDATE:
if (refbuf_state == REFBUF_RESET)
- set_refresh_frame_flags(refresh_frame_flags, true, true, true);
+ set_refresh_frame_flags(refresh_frame, true, true, true);
else
- set_refresh_frame_flags(refresh_frame_flags, true, false, false);
+ set_refresh_frame_flags(refresh_frame, true, false, false);
cpi->rc.is_src_frame_alt_ref = 1;
break;
@@ -82,19 +83,19 @@
case ARF_UPDATE:
// NOTE: BWDREF does not get updated along with ALTREF_FRAME.
if (refbuf_state == REFBUF_RESET)
- set_refresh_frame_flags(refresh_frame_flags, true, true, true);
+ set_refresh_frame_flags(refresh_frame, true, true, true);
else
- set_refresh_frame_flags(refresh_frame_flags, false, false, true);
+ set_refresh_frame_flags(refresh_frame, false, false, true);
break;
case INTNL_OVERLAY_UPDATE:
- set_refresh_frame_flags(refresh_frame_flags, false, false, false);
+ set_refresh_frame_flags(refresh_frame, false, false, false);
cpi->rc.is_src_frame_alt_ref = 1;
break;
case INTNL_ARF_UPDATE:
- set_refresh_frame_flags(refresh_frame_flags, false, true, false);
+ set_refresh_frame_flags(refresh_frame, false, true, false);
break;
default: assert(0); break;
@@ -102,7 +103,7 @@
if (ext_refresh_frame_flags->update_pending &&
(!is_stat_generation_stage(cpi))) {
- set_refresh_frame_flags(refresh_frame_flags,
+ set_refresh_frame_flags(refresh_frame,
ext_refresh_frame_flags->golden_frame,
ext_refresh_frame_flags->bwd_ref_frame,
ext_refresh_frame_flags->alt_ref_frame);
@@ -116,7 +117,7 @@
}
if (force_refresh_all)
- set_refresh_frame_flags(refresh_frame_flags, true, true, true);
+ set_refresh_frame_flags(refresh_frame, true, true, true);
}
static void set_additional_frame_flags(const AV1_COMMON *const cm,
@@ -362,10 +363,9 @@
// Update frame_flags to tell the encoder's caller what sort of frame was
// encoded.
-static void update_frame_flags(
- const AV1_COMMON *const cm,
- const RefreshFrameFlagsInfo *const refresh_frame_flags,
- unsigned int *frame_flags) {
+static void update_frame_flags(const AV1_COMMON *const cm,
+ const RefreshFrameInfo *const refresh_frame,
+ unsigned int *frame_flags) {
if (encode_show_existing_frame(cm)) {
*frame_flags &= ~FRAMEFLAGS_GOLDEN;
*frame_flags &= ~FRAMEFLAGS_BWDREF;
@@ -374,19 +374,19 @@
return;
}
- if (refresh_frame_flags->golden_frame) {
+ if (refresh_frame->golden_frame) {
*frame_flags |= FRAMEFLAGS_GOLDEN;
} else {
*frame_flags &= ~FRAMEFLAGS_GOLDEN;
}
- if (refresh_frame_flags->alt_ref_frame) {
+ if (refresh_frame->alt_ref_frame) {
*frame_flags |= FRAMEFLAGS_ALTREF;
} else {
*frame_flags &= ~FRAMEFLAGS_ALTREF;
}
- if (refresh_frame_flags->bwd_ref_frame) {
+ if (refresh_frame->bwd_ref_frame) {
*frame_flags |= FRAMEFLAGS_BWDREF;
} else {
*frame_flags &= ~FRAMEFLAGS_BWDREF;
diff --git a/av1/encoder/encode_strategy.h b/av1/encoder/encode_strategy.h
index 0ae4c05..15681c3 100644
--- a/av1/encoder/encode_strategy.h
+++ b/av1/encoder/encode_strategy.h
@@ -62,10 +62,11 @@
// Set individual buffer update flags based on frame reference type.
// force_refresh_all is used when we have a KEY_FRAME or S_FRAME. It forces all
// refresh_*_frame flags to be set, because we refresh all buffers in this case.
-void av1_configure_buffer_updates(
- AV1_COMP *const cpi, RefreshFrameFlagsInfo *const refresh_frame_flags,
- const FRAME_UPDATE_TYPE type, const REFBUF_STATE refbuf_state,
- int force_refresh_all);
+void av1_configure_buffer_updates(AV1_COMP *const cpi,
+ RefreshFrameInfo *const refresh_frame,
+ const FRAME_UPDATE_TYPE type,
+ const REFBUF_STATE refbuf_state,
+ int force_refresh_all);
int av1_get_refresh_frame_flags(const AV1_COMP *const cpi,
const EncodeFrameParams *const frame_params,
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 4b76485..8f40c3f 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -682,7 +682,7 @@
MACROBLOCK *const x = &cpi->td.mb;
AV1LevelParams *const level_params = &cpi->ppi->level_params;
InitialDimensions *const initial_dimensions = &cpi->initial_dimensions;
- RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
const FrameDimensionCfg *const frm_dim_cfg = &cpi->oxcf.frm_dim_cfg;
const RateControlCfg *const rc_cfg = &oxcf->rc_cfg;
@@ -735,8 +735,8 @@
p_rc->baseline_gf_interval = (MIN_GF_INTERVAL + MAX_GF_INTERVAL) / 2;
}
- refresh_frame_flags->golden_frame = false;
- refresh_frame_flags->bwd_ref_frame = false;
+ refresh_frame->golden_frame = false;
+ refresh_frame->bwd_ref_frame = false;
cm->features.refresh_frame_context =
(oxcf->tool_cfg.frame_parallel_decoding_mode)
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 1bb2ace..e2b7c55 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -1933,7 +1933,7 @@
bool golden_frame; /*!< Refresh flag for golden frame */
bool bwd_ref_frame; /*!< Refresh flag for bwd-ref frame */
bool alt_ref_frame; /*!< Refresh flag for alt-ref frame */
-} RefreshFrameFlagsInfo;
+} RefreshFrameInfo;
/*!
* \brief Desired dimensions for an externally triggered resize.
@@ -2682,7 +2682,7 @@
/*!
* Refresh frame flags for golden, bwd-ref and alt-ref frames.
*/
- RefreshFrameFlagsInfo refresh_frame;
+ RefreshFrameInfo refresh_frame;
/*!
* Flags signalled by the external interface at frame level.
@@ -3238,7 +3238,7 @@
* Flags which determine which reference buffers are refreshed by this
* frame.
*/
- RefreshFrameFlagsInfo refresh_frame;
+ RefreshFrameInfo refresh_frame;
/*!
* Speed level to use for this frame: Bigger number means faster.
diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index fe79df4..ef550e6 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -412,7 +412,7 @@
const RATE_CONTROL *const rc = &cpi->rc;
const PRIMARY_RATE_CONTROL *const p_rc = &cpi->ppi->p_rc;
const AV1_COMMON *const cm = &cpi->common;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
const int max_delta = 16;
const int change_avg_frame_bandwidth =
abs(rc->avg_frame_bandwidth - rc->prev_avg_frame_bandwidth) >
@@ -427,8 +427,7 @@
if (cm->current_frame.frame_type != KEY_FRAME && !cpi->ppi->use_svc &&
rc->frames_since_key > 1 && !change_target_bits_mb &&
(!cpi->oxcf.rc_cfg.gf_cbr_boost_pct ||
- !(refresh_frame_flags->alt_ref_frame ||
- refresh_frame_flags->golden_frame))) {
+ !(refresh_frame->alt_ref_frame || refresh_frame->golden_frame))) {
// Make sure q is between oscillating Qs to prevent resonance.
if (rc->rc_1_frame * rc->rc_2_frame == -1 &&
rc->q_1_frame != rc->q_2_frame) {
@@ -504,7 +503,7 @@
int height) {
const RATE_CONTROL *const rc = &cpi->rc;
const PRIMARY_RATE_CONTROL *const p_rc = &cpi->ppi->p_rc;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
double rcf;
double rate_correction_factors_kfstd;
double rate_correction_factors_gfarfstd;
@@ -545,8 +544,7 @@
#endif
rcf = rate_correction_factors_rflvl;
} else {
- if ((refresh_frame_flags->alt_ref_frame ||
- refresh_frame_flags->golden_frame) &&
+ if ((refresh_frame->alt_ref_frame || refresh_frame->golden_frame) &&
!rc->is_src_frame_alt_ref && !cpi->ppi->use_svc &&
(cpi->oxcf.rc_cfg.mode != AOM_CBR ||
cpi->oxcf.rc_cfg.gf_cbr_boost_pct > 20))
@@ -580,7 +578,7 @@
double factor, int width, int height) {
RATE_CONTROL *const rc = &cpi->rc;
PRIMARY_RATE_CONTROL *const p_rc = &cpi->ppi->p_rc;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
int update_default_rcf = 1;
// Normalize RCF to account for the size-dependent scaling factor.
factor /= resize_rate_factor(&cpi->oxcf.frm_dim_cfg, width, height);
@@ -601,8 +599,7 @@
#endif
if (update_default_rcf) p_rc->rate_correction_factors[rf_lvl] = factor;
} else {
- if ((refresh_frame_flags->alt_ref_frame ||
- refresh_frame_flags->golden_frame) &&
+ if ((refresh_frame->alt_ref_frame || refresh_frame->golden_frame) &&
!rc->is_src_frame_alt_ref && !cpi->ppi->use_svc &&
(cpi->oxcf.rc_cfg.mode != AOM_CBR ||
cpi->oxcf.rc_cfg.gf_cbr_boost_pct > 20)) {
@@ -847,7 +844,7 @@
static int calc_active_worst_quality_no_stats_vbr(const AV1_COMP *cpi) {
const RATE_CONTROL *const rc = &cpi->rc;
const PRIMARY_RATE_CONTROL *const p_rc = &cpi->ppi->p_rc;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
const unsigned int curr_frame = cpi->common.current_frame.frame_number;
int active_worst_quality;
int last_q_key_frame;
@@ -859,9 +856,9 @@
active_worst_quality =
curr_frame == 0 ? rc->worst_quality : last_q_key_frame * 2;
} else {
- if (!rc->is_src_frame_alt_ref && (refresh_frame_flags->golden_frame ||
- refresh_frame_flags->bwd_ref_frame ||
- refresh_frame_flags->alt_ref_frame)) {
+ if (!rc->is_src_frame_alt_ref &&
+ (refresh_frame->golden_frame || refresh_frame->bwd_ref_frame ||
+ refresh_frame->alt_ref_frame)) {
active_worst_quality =
curr_frame == 1 ? last_q_key_frame * 5 / 4 : last_q_inter_frame;
} else {
@@ -937,7 +934,7 @@
const AV1_COMMON *const cm = &cpi->common;
const RATE_CONTROL *const rc = &cpi->rc;
const PRIMARY_RATE_CONTROL *const p_rc = &cpi->ppi->p_rc;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
const CurrentFrame *const current_frame = &cm->current_frame;
int *rtc_minq;
const int bit_depth = cm->seq_params->bit_depth;
@@ -972,8 +969,7 @@
}
} else if (!rc->is_src_frame_alt_ref && !cpi->ppi->use_svc &&
cpi->oxcf.rc_cfg.gf_cbr_boost_pct &&
- (refresh_frame_flags->golden_frame ||
- refresh_frame_flags->alt_ref_frame)) {
+ (refresh_frame->golden_frame || refresh_frame->alt_ref_frame)) {
// Use the lower of active_worst_quality and recent
// average Q as basis for GF/ARF best Q limit unless last frame was
// a key frame.
@@ -1130,7 +1126,7 @@
const PRIMARY_RATE_CONTROL *const p_rc = &cpi->ppi->p_rc;
const CurrentFrame *const current_frame = &cm->current_frame;
const AV1EncoderConfig *const oxcf = &cpi->oxcf;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
const enum aom_rc_mode rc_mode = oxcf->rc_cfg.mode;
assert(has_no_stats_stage(cpi));
@@ -1182,8 +1178,7 @@
}
}
} else if (!rc->is_src_frame_alt_ref &&
- (refresh_frame_flags->golden_frame ||
- refresh_frame_flags->alt_ref_frame)) {
+ (refresh_frame->golden_frame || refresh_frame->alt_ref_frame)) {
// Use the lower of active_worst_quality and recent
// average Q as basis for GF/ARF best Q limit unless last frame was
// a key frame.
@@ -1201,7 +1196,7 @@
const int qindex = cq_level;
const double q_val = av1_convert_qindex_to_q(qindex, bit_depth);
const int delta_qindex =
- (refresh_frame_flags->alt_ref_frame)
+ (refresh_frame->alt_ref_frame)
? av1_compute_qdelta(rc, q_val, q_val * 0.40, bit_depth)
: av1_compute_qdelta(rc, q_val, q_val * 0.50, bit_depth);
active_best_quality = AOMMAX(qindex + delta_qindex, rc->best_quality);
@@ -1251,8 +1246,7 @@
&cpi->rc, current_frame->frame_type, active_worst_quality, 2.0,
cpi->is_screen_content_type, bit_depth);
} else if (!rc->is_src_frame_alt_ref &&
- (refresh_frame_flags->golden_frame ||
- refresh_frame_flags->alt_ref_frame)) {
+ (refresh_frame->golden_frame || refresh_frame->alt_ref_frame)) {
qdelta = av1_compute_qdelta_by_rate(
&cpi->rc, current_frame->frame_type, active_worst_quality, 1.75,
cpi->is_screen_content_type, bit_depth);
@@ -1428,7 +1422,7 @@
const AV1_COMMON *const cm = &cpi->common;
const RATE_CONTROL *const rc = &cpi->rc;
const PRIMARY_RATE_CONTROL *const p_rc = &cpi->ppi->p_rc;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
const int bit_depth = cpi->common.seq_params->bit_depth;
int active_best_quality = *active_best;
int active_worst_quality = *active_worst;
@@ -1437,8 +1431,8 @@
if (cpi->oxcf.rc_cfg.mode != AOM_Q) {
if (frame_is_intra_only(cm) ||
(!rc->is_src_frame_alt_ref &&
- (refresh_frame_flags->golden_frame || is_intrl_arf_boost ||
- refresh_frame_flags->alt_ref_frame))) {
+ (refresh_frame->golden_frame || is_intrl_arf_boost ||
+ refresh_frame->alt_ref_frame))) {
active_best_quality -=
(cpi->ppi->twopass.extend_minq + cpi->ppi->twopass.extend_minq_fast);
active_worst_quality += (cpi->ppi->twopass.extend_maxq / 2);
@@ -1544,7 +1538,7 @@
const RATE_CONTROL *const rc = &cpi->rc;
const PRIMARY_RATE_CONTROL *const p_rc = &cpi->ppi->p_rc;
const AV1EncoderConfig *const oxcf = &cpi->oxcf;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
const GF_GROUP *gf_group = &cpi->ppi->gf_group;
const enum aom_rc_mode rc_mode = oxcf->rc_cfg.mode;
int *inter_minq;
@@ -1559,8 +1553,8 @@
// TODO(jingning): Consider to rework this hack that covers issues incurred
// in lightfield setting.
if (cm->tiles.large_scale) {
- is_leaf_frame = !(refresh_frame_flags->golden_frame ||
- refresh_frame_flags->alt_ref_frame || is_intrl_arf_boost);
+ is_leaf_frame = !(refresh_frame->golden_frame ||
+ refresh_frame->alt_ref_frame || is_intrl_arf_boost);
}
const int is_overlay_frame = rc->is_src_frame_alt_ref;
@@ -1703,7 +1697,7 @@
const RATE_CONTROL *const rc = &cpi->rc;
const PRIMARY_RATE_CONTROL *const p_rc = &cpi->ppi->p_rc;
const AV1EncoderConfig *const oxcf = &cpi->oxcf;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
const GF_GROUP *gf_group = &cpi->ppi->gf_group;
assert(IMPLIES(has_no_stats_stage(cpi),
cpi->oxcf.rc_cfg.mode == AOM_Q &&
@@ -1753,8 +1747,8 @@
// leaf (non arf) frames. This is important to the TPL model which assumes
// Q drops with each arf level.
if (!(rc->is_src_frame_alt_ref) &&
- (refresh_frame_flags->golden_frame ||
- refresh_frame_flags->alt_ref_frame || is_intrl_arf_boost)) {
+ (refresh_frame->golden_frame || refresh_frame->alt_ref_frame ||
+ is_intrl_arf_boost)) {
active_worst_quality =
(active_best_quality + (3 * active_worst_quality) + 2) / 4;
}
@@ -1871,7 +1865,7 @@
RATE_CONTROL *const rc = &cpi->rc;
PRIMARY_RATE_CONTROL *const p_rc = &cpi->ppi->p_rc;
const GF_GROUP *const gf_group = &cpi->ppi->gf_group;
- const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
+ const RefreshFrameInfo *const refresh_frame = &cpi->refresh_frame;
const int is_intrnl_arf =
gf_group->update_type[cpi->gf_frame_index] == INTNL_ARF_UPDATE;
@@ -1896,8 +1890,8 @@
} else {
if ((cpi->ppi->use_svc && cpi->oxcf.rc_cfg.mode == AOM_CBR) ||
(!rc->is_src_frame_alt_ref &&
- !(refresh_frame_flags->golden_frame || is_intrnl_arf ||
- refresh_frame_flags->alt_ref_frame))) {
+ !(refresh_frame->golden_frame || is_intrnl_arf ||
+ refresh_frame->alt_ref_frame))) {
p_rc->last_q[INTER_FRAME] = qindex;
p_rc->avg_frame_qindex[INTER_FRAME] = ROUND_POWER_OF_TWO(
3 * p_rc->avg_frame_qindex[INTER_FRAME] + qindex, 2);
@@ -1918,8 +1912,8 @@
if ((qindex < p_rc->last_boosted_qindex) ||
(current_frame->frame_type == KEY_FRAME) ||
(!p_rc->constrained_gf_group &&
- (refresh_frame_flags->alt_ref_frame || is_intrnl_arf ||
- (refresh_frame_flags->golden_frame && !rc->is_src_frame_alt_ref)))) {
+ (refresh_frame->alt_ref_frame || is_intrnl_arf ||
+ (refresh_frame->golden_frame && !rc->is_src_frame_alt_ref)))) {
p_rc->last_boosted_qindex = qindex;
}
if (current_frame->frame_type == KEY_FRAME) p_rc->last_kf_qindex = qindex;
@@ -1946,7 +1940,7 @@
if (is_altref_enabled(cpi->oxcf.gf_cfg.lag_in_frames,
cpi->oxcf.gf_cfg.enable_auto_arf) &&
- refresh_frame_flags->alt_ref_frame &&
+ refresh_frame->alt_ref_frame &&
(current_frame->frame_type != KEY_FRAME && !frame_is_sframe(cm)))
// Update the alternate reference frame stats as appropriate.
update_alt_ref_frame_stats(cpi);
