Make GOP decision ahead of frame processing stage
Decide the GOP structure before the frame processing and coding
stages. This will cause slight coding performance change due to
fixes for prior issues in inter GOP assumptions. The average changes
are within 0.1% range.
STATS_CHANGED
Change-Id: Ib61baa33cb8d58f944aca5d50b66546b8b315b00
diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 480d8fa..d9a15b1 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -397,7 +397,7 @@
// If this is a key frame and keyframe filtering is enabled with overlay,
// then do not pop.
if (pop_lookahead && cpi->oxcf.kf_cfg.enable_keyframe_filtering > 1 &&
- cpi->rc.frames_to_key == 0 && cpi->rc.frames_till_gf_update_due == 0 &&
+ gf_group->update_type[gf_group->index] == ARF_UPDATE &&
!is_stat_generation_stage(cpi) && cpi->lookahead) {
if (cpi->lookahead->read_ctxs[cpi->compressor_stage].sz &&
(*flush ||
@@ -1093,6 +1093,16 @@
if (srcbuf_size < pop_size) return -1;
}
+ if (!av1_lookahead_peek(cpi->lookahead, 0, cpi->compressor_stage)) {
+#if !CONFIG_REALTIME_ONLY
+ if (flush && oxcf->pass == 1 && !cpi->twopass.first_pass_done) {
+ av1_end_first_pass(cpi); /* get last stats packet */
+ cpi->twopass.first_pass_done = 1;
+ }
+#endif
+ return -1;
+ }
+
// TODO(sarahparker) finish bit allocation for one pass pyramid
if (has_no_stats_stage(cpi)) {
gf_cfg->gf_max_pyr_height =
@@ -1101,6 +1111,15 @@
AOMMIN(gf_cfg->gf_min_pyr_height, gf_cfg->gf_max_pyr_height);
}
+#if !CONFIG_REALTIME_ONLY
+ const int use_one_pass_rt_params = has_no_stats_stage(cpi) &&
+ oxcf->mode == REALTIME &&
+ gf_cfg->lag_in_frames == 0;
+ if (!use_one_pass_rt_params && !is_stat_generation_stage(cpi)) {
+ av1_get_second_pass_params(cpi, &frame_params, &frame_input, *frame_flags);
+ }
+#endif
+
if (!is_stat_generation_stage(cpi)) {
// If this is a forward keyframe, mark as a show_existing_frame
// TODO(bohanli): find a consistent condition for fwd keyframes
@@ -1157,6 +1176,7 @@
}
av1_apply_encoding_flags(cpi, source->flags);
+
if (!frame_params.show_existing_frame)
*frame_flags = (source->flags & AOM_EFLAG_FORCE_KF) ? FRAMEFLAGS_KEY : 0;
@@ -1181,16 +1201,18 @@
#if CONFIG_REALTIME_ONLY
av1_get_one_pass_rt_params(cpi, &frame_params, *frame_flags);
+ if (cpi->oxcf.speed >= 6 && cm->number_spatial_layers == 1 &&
+ cm->number_temporal_layers == 1)
+ av1_set_reference_structure_one_pass_rt(cpi, gf_group->index == 0);
#else
- const int use_one_pass_rt_params = has_no_stats_stage(cpi) &&
- oxcf->mode == REALTIME &&
- gf_cfg->lag_in_frames == 0;
if (use_one_pass_rt_params) {
av1_get_one_pass_rt_params(cpi, &frame_params, *frame_flags);
- } else if (!is_stat_generation_stage(cpi)) {
- av1_get_second_pass_params(cpi, &frame_params, &frame_input, *frame_flags);
+ if (cpi->oxcf.speed >= 6 && cm->number_spatial_layers == 1 &&
+ cm->number_temporal_layers == 1)
+ av1_set_reference_structure_one_pass_rt(cpi, gf_group->index == 0);
}
#endif
+
FRAME_UPDATE_TYPE frame_update_type = get_frame_update_type(gf_group);
if (frame_params.show_existing_frame &&
