Abstract lap_enabled to AV1_PRIMARY
Moved lap_enabled from AV1_COMP to AV1_PRIMARY.
Change-Id: I5abe863d4bf5845e7ddae616c528998d40a58c11
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index f5ddbe4..441f07c 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -2073,7 +2073,8 @@
priv->oxcf.use_highbitdepth =
(ctx->init_flags & AOM_CODEC_USE_HIGHBITDEPTH) ? 1 : 0;
- priv->ppi = av1_create_primary_compressor(&priv->pkt_list.head);
+ priv->ppi =
+ av1_create_primary_compressor(&priv->pkt_list.head, *num_lap_buffers);
if (!priv->ppi) return AOM_CODEC_MEM_ERROR;
#if !CONFIG_REALTIME_ONLY
@@ -2171,7 +2172,7 @@
AV1_COMP *cpi_lap = ppi->cpi_lap;
if (cpi == NULL) return AOM_CODEC_INVALID_PARAM;
- if (cpi->lap_enabled && cpi_lap == NULL && cpi->oxcf.pass == 0)
+ if (cpi->ppi->lap_enabled && cpi_lap == NULL && cpi->oxcf.pass == 0)
return AOM_CODEC_INVALID_PARAM;
if (img != NULL) {
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index fada54c..4240dbb 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -599,7 +599,7 @@
// calculated at init time. This stores and restores LAP's lag in frames to
// prevent override by new cfg.
int lap_lag_in_frames = -1;
- if (cpi->lap_enabled && cpi->compressor_stage == LAP_STAGE) {
+ if (cpi->ppi->lap_enabled && cpi->compressor_stage == LAP_STAGE) {
lap_lag_in_frames = cpi->oxcf.gf_cfg.lag_in_frames;
}
@@ -841,12 +841,13 @@
}
AV1_PRIMARY *av1_create_primary_compressor(
- struct aom_codec_pkt_list *pkt_list_head) {
+ struct aom_codec_pkt_list *pkt_list_head, int num_lap_buffers) {
AV1_PRIMARY *volatile const ppi = aom_memalign(32, sizeof(AV1_PRIMARY));
if (!ppi) return NULL;
av1_zero(*ppi);
ppi->seq_params_locked = 0;
+ ppi->lap_enabled = num_lap_buffers > 0;
ppi->output_pkt_list = pkt_list_head;
return ppi;
}
@@ -876,7 +877,6 @@
}
cm->error.setjmp = 1;
- cpi->lap_enabled = num_lap_buffers > 0;
cpi->compressor_stage = stage;
CommonModeInfoParams *const mi_params = &cm->mi_params;
@@ -909,7 +909,7 @@
// For two pass and lag_in_frames > 33 in LAP.
cpi->rc.enable_scenecut_detection = ENABLE_SCENECUT_MODE_2;
- if (cpi->lap_enabled) {
+ if (cpi->ppi->lap_enabled) {
if ((num_lap_buffers <
(MAX_GF_LENGTH_LAP + SCENE_CUT_KEY_TEST_INTERVAL + 1)) &&
num_lap_buffers >= (MAX_GF_LENGTH_LAP + 3)) {
@@ -1006,7 +1006,7 @@
const size_t packet_sz = sizeof(FIRSTPASS_STATS);
const int packets = (int)(oxcf->twopass_stats_in.sz / packet_sz);
- if (!cpi->lap_enabled) {
+ if (!cpi->ppi->lap_enabled) {
/*Re-initialize to stats buffer, populated by application in the case of
* two pass*/
cpi->twopass.stats_buf_ctx->stats_in_start = oxcf->twopass_stats_in.buf;
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index bf51e2d..6652964 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -2101,6 +2101,11 @@
* Track prior gf group state.
*/
GF_STATE gf_state;
+
+ /*!
+ * Flag indicating whether look ahead processing (LAP) is enabled.
+ */
+ int lap_enabled;
} AV1_PRIMARY;
/*!
@@ -2640,10 +2645,6 @@
SVC svc;
/*!
- * Flag indicating whether look ahead processing (LAP) is enabled.
- */
- int lap_enabled;
- /*!
* Indicates whether current processing stage is encode stage or LAP stage.
*/
COMPRESSOR_STAGE compressor_stage;
@@ -2796,7 +2797,7 @@
STATS_BUFFER_CTX *stats_buf_context);
struct AV1_PRIMARY *av1_create_primary_compressor(
- struct aom_codec_pkt_list *pkt_list_head);
+ struct aom_codec_pkt_list *pkt_list_head, int num_lap_buffers);
void av1_remove_compressor(AV1_COMP *cpi);
@@ -3030,7 +3031,7 @@
// Check if statistics generation stage
static INLINE int is_stat_generation_stage(const AV1_COMP *const cpi) {
assert(IMPLIES(cpi->compressor_stage == LAP_STAGE,
- cpi->oxcf.pass == 0 && cpi->lap_enabled));
+ cpi->oxcf.pass == 0 && cpi->ppi->lap_enabled));
return (cpi->oxcf.pass == 1 || (cpi->compressor_stage == LAP_STAGE));
}
// Check if statistics consumption stage
@@ -3042,7 +3043,7 @@
static INLINE int is_stat_consumption_stage(const AV1_COMP *const cpi) {
return (is_stat_consumption_stage_twopass(cpi) ||
(cpi->oxcf.pass == 0 && (cpi->compressor_stage == ENCODE_STAGE) &&
- cpi->lap_enabled));
+ cpi->ppi->lap_enabled));
}
/*!\endcond */
@@ -3055,8 +3056,9 @@
* \return 0 if no stats for current stage else 1
*/
static INLINE int has_no_stats_stage(const AV1_COMP *const cpi) {
- assert(IMPLIES(!cpi->lap_enabled, cpi->compressor_stage == ENCODE_STAGE));
- return (cpi->oxcf.pass == 0 && !cpi->lap_enabled);
+ assert(
+ IMPLIES(!cpi->ppi->lap_enabled, cpi->compressor_stage == ENCODE_STAGE));
+ return (cpi->oxcf.pass == 0 && !cpi->ppi->lap_enabled);
}
/*!\cond */
diff --git a/av1/encoder/encoder_utils.c b/av1/encoder/encoder_utils.c
index 702b08d..70bc130 100644
--- a/av1/encoder/encoder_utils.c
+++ b/av1/encoder/encoder_utils.c
@@ -498,7 +498,7 @@
aom_clear_system_state();
cpi->rd.r0 = (double)intra_cost_base / mc_dep_cost_base;
if (is_frame_tpl_eligible(gf_group, cpi->gf_frame_index)) {
- if (cpi->lap_enabled) {
+ if (cpi->ppi->lap_enabled) {
double min_boost_factor = sqrt(cpi->rc.baseline_gf_interval);
const int gfu_boost = get_gfu_boost_from_r0_lap(
min_boost_factor, MAX_GFUBOOST_FACTOR, cpi->rd.r0,
diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index 520afcc..d9bf77d 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -177,7 +177,7 @@
}
void av1_end_first_pass(AV1_COMP *cpi) {
- if (cpi->twopass.stats_buf_ctx->total_stats && !cpi->lap_enabled)
+ if (cpi->twopass.stats_buf_ctx->total_stats && !cpi->ppi->lap_enabled)
output_stats(cpi->twopass.stats_buf_ctx->total_stats,
cpi->ppi->output_pkt_list);
}
@@ -849,7 +849,7 @@
// We will store the stats inside the persistent twopass struct (and NOT the
// local variable 'fps'), and then cpi->output_pkt_list will point to it.
*this_frame_stats = fps;
- if (!cpi->lap_enabled)
+ if (!cpi->ppi->lap_enabled)
output_stats(this_frame_stats, cpi->ppi->output_pkt_list);
if (cpi->twopass.stats_buf_ctx->total_stats != NULL) {
av1_accumulate_stats(cpi->twopass.stats_buf_ctx->total_stats, &fps);
diff --git a/av1/encoder/pass2_strategy.c b/av1/encoder/pass2_strategy.c
index 30f1945..e075ed1 100644
--- a/av1/encoder/pass2_strategy.c
+++ b/av1/encoder/pass2_strategy.c
@@ -194,7 +194,7 @@
const double max_fac = 1.0 + adj_limit;
if (rc->vbr_bits_off_target && rc->total_actual_bits > 0) {
- if (cpi->lap_enabled) {
+ if (cpi->ppi->lap_enabled) {
rate_err_factor =
(double)twopass->rolling_arf_group_actual_bits /
DOUBLE_DIVIDE_CHECK((double)twopass->rolling_arf_group_target_bits);
@@ -209,7 +209,7 @@
// Adjustment is damped if this is 1 pass with look ahead processing
// (as there are only ever a few frames of data) and for all but the first
// GOP in normal two pass.
- if ((twopass->bpm_factor != 1.0) || cpi->lap_enabled) {
+ if ((twopass->bpm_factor != 1.0) || cpi->ppi->lap_enabled) {
rate_err_factor = 1.0 + ((rate_err_factor - 1.0) / damp_fac);
}
}
@@ -998,7 +998,7 @@
// so we can continue for more frames.
if (((frame_index - cur_start) >= active_max_gf_interval + 1) &&
!is_almost_static(gf_stats->zero_motion_accumulator,
- twopass->kf_zeromotion_pct, cpi->lap_enabled)) {
+ twopass->kf_zeromotion_pct, cpi->ppi->lap_enabled)) {
return 1;
}
return 0;
@@ -1950,7 +1950,7 @@
const int min_shrink_int = AOMMAX(MIN_SHRINK_LEN, active_min_gf_interval);
i = (rc->frames_since_key == 0);
- max_intervals = cpi->lap_enabled ? 1 : max_intervals;
+ max_intervals = cpi->ppi->lap_enabled ? 1 : max_intervals;
int count_cuts = 1;
// If cpi->gf_state.arf_gf_boost_lst is 0, we are starting with a KF or GF.
int cur_start = -1 + !cpi->ppi->gf_state.arf_gf_boost_lst, cur_last;
@@ -2357,7 +2357,7 @@
}
// correct frames_to_key when lookahead queue is emptying
- if (cpi->lap_enabled) {
+ if (cpi->ppi->lap_enabled) {
correct_frames_to_key(cpi);
}
@@ -2465,7 +2465,7 @@
if (can_disable_arf) {
use_alt_ref =
!is_almost_static(gf_stats.zero_motion_accumulator,
- twopass->kf_zeromotion_pct, cpi->lap_enabled) &&
+ twopass->kf_zeromotion_pct, cpi->ppi->lap_enabled) &&
rc->use_arf_in_this_kf_group && (i < gf_cfg->lag_in_frames) &&
(i >= MIN_GF_INTERVAL);
@@ -2538,8 +2538,8 @@
// Calculate the boost for alt ref.
rc->gfu_boost = av1_calc_arf_boost(
twopass, rc, frame_info, alt_offset, forward_frames, ext_len,
- cpi->lap_enabled ? &rc->num_stats_used_for_gfu_boost : NULL,
- cpi->lap_enabled ? &rc->num_stats_required_for_gfu_boost : NULL);
+ cpi->ppi->lap_enabled ? &rc->num_stats_used_for_gfu_boost : NULL,
+ cpi->ppi->lap_enabled ? &rc->num_stats_required_for_gfu_boost : NULL);
} else {
reset_fpf_position(twopass, start_pos);
gf_group->max_layer_depth_allowed = 0;
@@ -2550,8 +2550,9 @@
MAX_GF_BOOST,
av1_calc_arf_boost(
twopass, rc, frame_info, alt_offset, ext_len, 0,
- cpi->lap_enabled ? &rc->num_stats_used_for_gfu_boost : NULL,
- cpi->lap_enabled ? &rc->num_stats_required_for_gfu_boost : NULL));
+ cpi->ppi->lap_enabled ? &rc->num_stats_used_for_gfu_boost : NULL,
+ cpi->ppi->lap_enabled ? &rc->num_stats_required_for_gfu_boost
+ : NULL));
}
#define LAST_ALR_BOOST_FACTOR 0.2f
@@ -2569,7 +2570,7 @@
// Reset the file position.
reset_fpf_position(twopass, start_pos);
- if (cpi->lap_enabled) {
+ if (cpi->ppi->lap_enabled) {
// Since we don't have enough stats to know the actual error of the
// gf group, we assume error of each frame to be equal to 1 and set
// the error of the group as baseline_gf_interval.
@@ -2981,7 +2982,7 @@
if (kf_group_err != NULL)
rc->num_stats_used_for_kf_boost = num_stats_used_for_kf_boost;
- if (cpi->lap_enabled && !scenecut_detected)
+ if (cpi->ppi->lap_enabled && !scenecut_detected)
frames_to_key = num_frames_to_next_key;
if (!kf_cfg->fwd_kf_enabled || scenecut_detected ||
@@ -3017,7 +3018,7 @@
RATE_CONTROL *const rc = &cpi->rc;
TWO_PASS *const twopass = &cpi->twopass;
int64_t kf_group_bits;
- if (cpi->lap_enabled) {
+ if (cpi->ppi->lap_enabled) {
kf_group_bits = (int64_t)rc->frames_to_key * rc->avg_frame_bandwidth;
if (cpi->oxcf.rc_cfg.vbr_corpus_complexity_lap) {
const int num_mbs = (cpi->oxcf.resize_cfg.resize_mode != RESIZE_NONE)
@@ -3219,7 +3220,7 @@
else
rc->frames_to_key = kf_cfg->key_freq_max;
- if (cpi->lap_enabled) correct_frames_to_key(cpi);
+ if (cpi->ppi->lap_enabled) correct_frames_to_key(cpi);
// If there is a max kf interval set by the user we must obey it.
// We already breakout of the loop above at 2x max.
@@ -3262,7 +3263,7 @@
// Calculate the number of bits that should be assigned to the kf group.
if ((twopass->bits_left > 0 && twopass->modified_error_left > 0.0) ||
- (cpi->lap_enabled && oxcf->rc_cfg.mode != AOM_Q)) {
+ (cpi->ppi->lap_enabled && oxcf->rc_cfg.mode != AOM_Q)) {
// Maximum number of bits for a single normal frame (not key frame).
const int max_bits = frame_max_bits(rc, oxcf);
@@ -3287,7 +3288,7 @@
}
twopass->kf_group_bits = AOMMAX(0, twopass->kf_group_bits);
- if (cpi->lap_enabled) {
+ if (cpi->ppi->lap_enabled) {
// In the case of single pass based on LAP, frames to key may have an
// inaccurate value, and hence should be clipped to an appropriate
// interval.
@@ -3320,7 +3321,7 @@
rc->kf_boost = (int)boost_score;
- if (cpi->lap_enabled) {
+ if (cpi->ppi->lap_enabled) {
if (oxcf->rc_cfg.mode == AOM_Q) {
rc->kf_boost = get_projected_kf_boost(cpi);
} else {
@@ -3365,7 +3366,7 @@
gf_group->update_type[0] = KF_UPDATE;
// Note the total error score of the kf group minus the key frame itself.
- if (cpi->lap_enabled)
+ if (cpi->ppi->lap_enabled)
// As we don't have enough stats to know the actual error of the group,
// we assume the complexity of each frame to be equal to 1, and set the
// error as the number of frames in the group(minus the keyframe).
@@ -3412,7 +3413,7 @@
int section_target_bandwidth;
const int frames_left = (int)(twopass->stats_buf_ctx->total_stats->count -
current_frame->frame_number);
- if (cpi->lap_enabled)
+ if (cpi->ppi->lap_enabled)
section_target_bandwidth = (int)rc->avg_frame_bandwidth;
else
section_target_bandwidth = (int)(twopass->bits_left / frames_left);
@@ -3429,7 +3430,7 @@
if (cpi->oxcf.rc_cfg.mode != AOM_Q && current_frame->frame_number == 0 &&
cpi->gf_frame_index == 0 && cpi->twopass.stats_buf_ctx->total_stats &&
cpi->twopass.stats_buf_ctx->total_left_stats) {
- if (cpi->lap_enabled) {
+ if (cpi->ppi->lap_enabled) {
/*
* Accumulate total_stats using available limited number of stats,
* and assign it to total_left_stats.
@@ -3463,7 +3464,7 @@
}
int err = 0;
- if (cpi->lap_enabled) {
+ if (cpi->ppi->lap_enabled) {
err = input_stats_lap(twopass, this_frame);
} else {
err = input_stats(twopass, this_frame);
@@ -3609,7 +3610,7 @@
cpi->gf_frame_index == gf_group->size);
const FIRSTPASS_STATS *const start_position = twopass->stats_in;
- if (cpi->lap_enabled && cpi->rc.enable_scenecut_detection) {
+ if (cpi->ppi->lap_enabled && cpi->rc.enable_scenecut_detection) {
int num_frames_to_detect_scenecut, frames_to_key;
num_frames_to_detect_scenecut = MAX_GF_LENGTH_LAP + 1;
frames_to_key = define_kf_interval(cpi, &this_frame, NULL,
diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index e3ade4b..e69e402 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -1958,7 +1958,7 @@
* The no.of.stats available in the case of LAP is limited,
* hence setting to max_gf_interval.
*/
- if (cpi->lap_enabled)
+ if (cpi->ppi->lap_enabled)
rc->static_scene_max_gf_interval = rc->max_gf_interval + 1;
else
rc->static_scene_max_gf_interval = MAX_STATIC_GF_GROUP_LENGTH;
diff --git a/doc/dev_guide/av1_encoder.dox b/doc/dev_guide/av1_encoder.dox
index c0facdd..00c73a5 100644
--- a/doc/dev_guide/av1_encoder.dox
+++ b/doc/dev_guide/av1_encoder.dox
@@ -105,6 +105,7 @@
- \ref AV1_PRIMARY
- \ref AV1_PRIMARY.gf_group (\ref GF_GROUP)
+ - \ref AV1_PRIMARY.lap_enabled
- \ref AV1_COMP
- \ref AV1_COMP.oxcf (\ref AV1EncoderConfig)
@@ -113,7 +114,6 @@
- \ref AV1_COMP.twopass (\ref TWO_PASS)
- \ref AV1_COMP.speed
- \ref AV1_COMP.sf (\ref SPEED_FEATURES)
- - \ref AV1_COMP.lap_enabled
- \ref AV1EncoderConfig (Encoder configuration parameters)
- \ref AV1EncoderConfig.pass
@@ -664,7 +664,7 @@
few frames. When using this method, full sequence level statistics are not
available, but it is possible to collect and use frame or group of frame level
data to help in the allocation of bits and in defining ARF/GF coding
-hierarchies. The reader is referred to the \ref AV1_COMP.lap_enabled field
+hierarchies. The reader is referred to the \ref AV1_PRIMARY.lap_enabled field
in the main compressor instance (where <b>lap</b> stands for
<b>look ahead processing</b>). This encoding mode for the most part uses the
same rate control pathways as two pass VBR encoding.
@@ -792,7 +792,7 @@
current and the following GF groups (a total number of MAX_NUM_GF_INTERVALS
groups) to be the maximum value allowed.</li>
- <li><b>Single pass with look-ahead enabled (\ref AV1_COMP.lap_enabled):</b>
+ <li><b>Single pass with look-ahead enabled (\ref AV1_PRIMARY.lap_enabled):</b>
look-ahead processing is enabled for single pass, therefore there is a
limited amount of information available regarding future frames. In this
case the function will determine the length based on \ref FIRSTPASS_STATS
@@ -901,7 +901,7 @@
zero.
For single pass encodes where look-ahead processing is disabled
-(\ref AV1_COMP.lap_enabled = 0), \ref define_gf_group_pass0() is used
+(\ref AV1_PRIMARY.lap_enabled = 0), \ref define_gf_group_pass0() is used
instead of \ref define_gf_group().
\subsection architecture_enc_kf_groups Key Frame Groups
