ref: 2acb7fc1d3b82f32875c890319597a68b44041c2
parent: 3cc90a6d1849efefbd68175d815efa9e30b52e9f
author: Jerome Jiang <jianj@google.com>
date: Fri Apr 13 11:36:39 EDT 2018
Clean up is_two_pass_svc. Change-Id: I9e92616471be380d3ba4e2b85399d7eb9f687d2f
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -1117,11 +1117,7 @@
((cpi->svc.number_temporal_layers > 1 &&
cpi->oxcf.rc_mode == VPX_CBR) ||
(cpi->svc.number_spatial_layers > 1 &&
- cpi->svc.layer_context[cpi->svc.spatial_layer_id].is_key_frame) ||
- (is_two_pass_svc(cpi) &&
- cpi->svc.encode_empty_frame_state == ENCODING &&
- cpi->svc.layer_context[0].frames_from_key_frame <
- cpi->svc.number_temporal_layers + 1))) {+ cpi->svc.layer_context[cpi->svc.spatial_layer_id].is_key_frame))) {found = 0;
} else if (cfg != NULL) {found =
--- a/vp9/encoder/vp9_bitstream.h
+++ b/vp9/encoder/vp9_bitstream.h
@@ -39,11 +39,7 @@
static INLINE int vp9_preserve_existing_gf(VP9_COMP *cpi) {return !cpi->multi_arf_allowed && cpi->refresh_golden_frame &&
- cpi->rc.is_src_frame_alt_ref &&
- (!cpi->use_svc || // Add spatial svc base layer case here
- (is_two_pass_svc(cpi) && cpi->svc.spatial_layer_id == 0 &&
- cpi->svc.layer_context[0].gold_ref_idx >= 0 &&
- cpi->oxcf.ss_enable_auto_arf[0]));
+ cpi->rc.is_src_frame_alt_ref && !cpi->use_svc;
}
#ifdef __cplusplus
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -791,7 +791,7 @@
}
if (cm->frame_type == KEY_FRAME) {- if (!is_two_pass_svc(cpi)) cpi->refresh_golden_frame = 1;
+ cpi->refresh_golden_frame = 1;
cpi->refresh_alt_ref_frame = 1;
vp9_zero(cpi->interp_filter_selected);
} else {@@ -1347,15 +1347,9 @@
int min_log2_tile_cols, max_log2_tile_cols;
vp9_get_tile_n_bits(cm->mi_cols, &min_log2_tile_cols, &max_log2_tile_cols);
- if (is_two_pass_svc(cpi) && (cpi->svc.encode_empty_frame_state == ENCODING ||
- cpi->svc.number_spatial_layers > 1)) {- cm->log2_tile_cols = 0;
- cm->log2_tile_rows = 0;
- } else {- cm->log2_tile_cols =
- clamp(cpi->oxcf.tile_columns, min_log2_tile_cols, max_log2_tile_cols);
- cm->log2_tile_rows = cpi->oxcf.tile_rows;
- }
+ cm->log2_tile_cols =
+ clamp(cpi->oxcf.tile_columns, min_log2_tile_cols, max_log2_tile_cols);
+ cm->log2_tile_rows = cpi->oxcf.tile_rows;
if (cpi->oxcf.target_level == LEVEL_AUTO) {const int level_tile_cols =
@@ -1378,18 +1372,6 @@
cm->mi_rows * cm->mi_cols * sizeof(*cpi->mbmi_ext_base));
set_tile_limits(cpi);
-
- if (is_two_pass_svc(cpi)) {- if (vpx_realloc_frame_buffer(&cpi->alt_ref_buffer, cm->width, cm->height,
- cm->subsampling_x, cm->subsampling_y,
-#if CONFIG_VP9_HIGHBITDEPTH
- cm->use_highbitdepth,
-#endif
- VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment,
- NULL, NULL, NULL))
- vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
- "Failed to reallocate alt_ref_buffer");
- }
}
static void init_buffer_indices(VP9_COMP *cpi) {@@ -2971,11 +2953,6 @@
tmp = cpi->alt_fb_idx;
cpi->alt_fb_idx = cpi->gld_fb_idx;
cpi->gld_fb_idx = tmp;
-
- if (is_two_pass_svc(cpi)) {- cpi->svc.layer_context[0].gold_ref_idx = cpi->gld_fb_idx;
- cpi->svc.layer_context[0].alt_ref_idx = cpi->alt_fb_idx;
- }
} else { /* For non key/golden frames */ if (cpi->refresh_alt_ref_frame) {int arf_idx = cpi->alt_fb_idx;
@@ -3550,9 +3527,7 @@
#endif
}
- if ((oxcf->pass == 2) &&
- (!cpi->use_svc || (is_two_pass_svc(cpi) &&
- cpi->svc.encode_empty_frame_state != ENCODING))) {+ if ((oxcf->pass == 2) && !cpi->use_svc) {vp9_set_target_rate(cpi);
}
@@ -4578,45 +4553,7 @@
cm->reset_frame_context = 2;
}
}
- if (is_two_pass_svc(cpi) && cm->error_resilient_mode == 0) {- // Use context 0 for intra only empty frame, but the last frame context
- // for other empty frames.
- if (cpi->svc.encode_empty_frame_state == ENCODING) {- if (cpi->svc.encode_intra_empty_frame != 0)
- cm->frame_context_idx = 0;
- else
- cm->frame_context_idx = FRAME_CONTEXTS - 1;
- } else {- cm->frame_context_idx =
- cpi->svc.spatial_layer_id * cpi->svc.number_temporal_layers +
- cpi->svc.temporal_layer_id;
- }
- cm->frame_parallel_decoding_mode = oxcf->frame_parallel_decoding_mode;
-
- // The probs will be updated based on the frame type of its previous
- // frame if frame_parallel_decoding_mode is 0. The type may vary for
- // the frame after a key frame in base layer since we may drop enhancement
- // layers. So set frame_parallel_decoding_mode to 1 in this case.
- if (cm->frame_parallel_decoding_mode == 0) {- if (cpi->svc.number_temporal_layers == 1) {- if (cpi->svc.spatial_layer_id == 0 &&
- cpi->svc.layer_context[0].last_frame_type == KEY_FRAME)
- cm->frame_parallel_decoding_mode = 1;
- } else if (cpi->svc.spatial_layer_id == 0) {- // Find the 2nd frame in temporal base layer and 1st frame in temporal
- // enhancement layers from the key frame.
- int i;
- for (i = 0; i < cpi->svc.number_temporal_layers; ++i) {- if (cpi->svc.layer_context[0].frames_from_key_frame == 1 << i) {- cm->frame_parallel_decoding_mode = 1;
- break;
- }
- }
- }
- }
- }
-
// For 1 pass CBR, check if we are dropping this frame.
// Never drop on key frame, or if base layer is key for svc.
if (oxcf->pass == 0 && oxcf->rc_mode == VPX_CBR &&
@@ -4759,8 +4696,7 @@
cm->last_frame_type = cm->frame_type;
- if (!(is_two_pass_svc(cpi) && cpi->svc.encode_empty_frame_state == ENCODING))
- vp9_rc_postencode_update(cpi, *size);
+ vp9_rc_postencode_update(cpi, *size);
#if 0
output_frame_level_debug_stats(cpi);
@@ -4830,8 +4766,7 @@
cpi->allow_encode_breakout = ENCODE_BREAKOUT_ENABLED;
encode_frame_to_data_rate(cpi, size, dest, frame_flags);
- if (!(is_two_pass_svc(cpi) && cpi->svc.encode_empty_frame_state == ENCODING))
- vp9_twopass_postencode_update(cpi);
+ vp9_twopass_postencode_update(cpi);
}
#endif // !CONFIG_REALTIME_ONLY
@@ -5271,9 +5206,7 @@
int arf_src_index;
int i;
- if (is_two_pass_svc(cpi)) {- if (oxcf->pass == 2) vp9_restore_layer_context(cpi);
- } else if (is_one_pass_cbr_svc(cpi)) {+ if (is_one_pass_cbr_svc(cpi)) {vp9_one_pass_cbr_svc_start_layer(cpi);
}
@@ -5301,9 +5234,6 @@
// Should we encode an arf frame.
arf_src_index = get_arf_src_index(cpi);
- // Skip alt frame if we encode the empty frame
- if (is_two_pass_svc(cpi) && source != NULL) arf_src_index = 0;
-
if (arf_src_index) { for (i = 0; i <= arf_src_index; ++i) {struct lookahead_entry *e = vp9_lookahead_peek(cpi->lookahead, i);
@@ -5456,9 +5386,7 @@
cpi->frame_flags = *frame_flags;
#if !CONFIG_REALTIME_ONLY
- if ((oxcf->pass == 2) &&
- (!cpi->use_svc || (is_two_pass_svc(cpi) &&
- cpi->svc.encode_empty_frame_state != ENCODING))) {+ if ((oxcf->pass == 2) && !cpi->use_svc) {vp9_rc_get_second_pass_params(cpi);
} else if (oxcf->pass == 1) {set_frame_size(cpi);
@@ -5482,7 +5410,7 @@
Pass0Encode(cpi, size, dest, frame_flags);
}
#else // !CONFIG_REALTIME_ONLY
- if (oxcf->pass == 1 && (!cpi->use_svc || is_two_pass_svc(cpi))) {+ if (oxcf->pass == 1 && !cpi->use_svc) {const int lossless = is_lossless_requested(oxcf);
#if CONFIG_VP9_HIGHBITDEPTH
if (cpi->oxcf.use_highbitdepth)
@@ -5497,7 +5425,7 @@
#endif // CONFIG_VP9_HIGHBITDEPTH
cpi->td.mb.inv_txfm_add = lossless ? vp9_iwht4x4_add : vp9_idct4x4_add;
vp9_first_pass(cpi, source);
- } else if (oxcf->pass == 2 && (!cpi->use_svc || is_two_pass_svc(cpi))) {+ } else if (oxcf->pass == 2 && !cpi->use_svc) {Pass2Encode(cpi, size, dest, frame_flags);
} else if (cpi->use_svc) {SvcEncode(cpi, size, dest, frame_flags);
@@ -5698,21 +5626,7 @@
#endif
- if (is_two_pass_svc(cpi)) {- if (cpi->svc.encode_empty_frame_state == ENCODING) {- cpi->svc.encode_empty_frame_state = ENCODED;
- cpi->svc.encode_intra_empty_frame = 0;
- }
-
- if (cm->show_frame) {- ++cpi->svc.spatial_layer_to_encode;
- if (cpi->svc.spatial_layer_to_encode >= cpi->svc.number_spatial_layers)
- cpi->svc.spatial_layer_to_encode = 0;
-
- // May need the empty frame after an visible frame.
- cpi->svc.encode_empty_frame_state = NEED_TO_ENCODE;
- }
- } else if (is_one_pass_cbr_svc(cpi)) {+ if (is_one_pass_cbr_svc(cpi)) { if (cm->show_frame) {++cpi->svc.spatial_layer_to_encode;
if (cpi->svc.spatial_layer_to_encode >= cpi->svc.number_spatial_layers)
--- a/vp9/encoder/vp9_encoder.h
+++ b/vp9/encoder/vp9_encoder.h
@@ -860,10 +860,6 @@
void vp9_apply_encoding_flags(VP9_COMP *cpi, vpx_enc_frame_flags_t flags);
-static INLINE int is_two_pass_svc(const struct VP9_COMP *const cpi) {- return cpi->use_svc && cpi->oxcf.pass != 0;
-}
-
static INLINE int is_one_pass_cbr_svc(const struct VP9_COMP *const cpi) {return (cpi->use_svc && cpi->oxcf.pass == 0);
}
@@ -879,9 +875,7 @@
static INLINE int is_altref_enabled(const VP9_COMP *const cpi) {return !(cpi->oxcf.mode == REALTIME && cpi->oxcf.rc_mode == VPX_CBR) &&
cpi->oxcf.lag_in_frames >= MIN_LOOKAHEAD_FOR_ARFS &&
- (cpi->oxcf.enable_auto_arf &&
- (!is_two_pass_svc(cpi) ||
- cpi->oxcf.ss_enable_auto_arf[cpi->svc.spatial_layer_id]));
+ cpi->oxcf.enable_auto_arf;
}
static INLINE void set_ref_ptrs(VP9_COMMON *cm, MACROBLOCKD *xd,
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -316,16 +316,7 @@
}
void vp9_end_first_pass(VP9_COMP *cpi) {- if (is_two_pass_svc(cpi)) {- int i;
- for (i = 0; i < cpi->svc.number_spatial_layers; ++i) {- output_stats(&cpi->svc.layer_context[i].twopass.total_stats,
- cpi->output_pkt_list);
- }
- } else {- output_stats(&cpi->twopass.total_stats, cpi->output_pkt_list);
- }
-
+ output_stats(&cpi->twopass.total_stats, cpi->output_pkt_list);
vpx_free(cpi->twopass.fp_mb_float_stats);
cpi->twopass.fp_mb_float_stats = NULL;
}
@@ -849,9 +840,6 @@
YV12_BUFFER_CONFIG *const new_yv12 = get_frame_new_buffer(cm);
const YV12_BUFFER_CONFIG *first_ref_buf = lst_yv12;
- LAYER_CONTEXT *const lc =
- is_two_pass_svc(cpi) ? &cpi->svc.layer_context[cpi->svc.spatial_layer_id]
- : NULL;
MODE_INFO mi_above, mi_left;
double mb_intra_factor;
@@ -860,26 +848,8 @@
// First pass code requires valid last and new frame buffers.
assert(new_yv12 != NULL);
- assert((lc != NULL) || frame_is_intra_only(cm) || (lst_yv12 != NULL));
+ assert(frame_is_intra_only(cm) || (lst_yv12 != NULL));
- if (lc != NULL) {- // Use either last frame or alt frame for motion search.
- if (cpi->ref_frame_flags & VP9_LAST_FLAG) {- first_ref_buf = vp9_get_scaled_ref_frame(cpi, LAST_FRAME);
- if (first_ref_buf == NULL)
- first_ref_buf = get_ref_frame_buffer(cpi, LAST_FRAME);
- }
-
- if (cpi->ref_frame_flags & VP9_GOLD_FLAG) {- gld_yv12 = vp9_get_scaled_ref_frame(cpi, GOLDEN_FRAME);
- if (gld_yv12 == NULL) {- gld_yv12 = get_ref_frame_buffer(cpi, GOLDEN_FRAME);
- }
- } else {- gld_yv12 = NULL;
- }
- }
-
xd->mi = cm->mi_grid_visible + xd->mi_stride * (mb_row << 1) +
(tile.mi_col_start >> 1);
xd->mi[0] = cm->mi + xd->mi_stride * (mb_row << 1) + (tile.mi_col_start >> 1);
@@ -1072,8 +1042,7 @@
((cm->mb_cols - 1 - mb_col) * 16) + BORDER_MV_PIXELS_B16;
// Other than for the first frame do a motion search.
- if ((lc == NULL && cm->current_video_frame > 0) ||
- (lc != NULL && lc->current_video_frame_in_layer > 0)) {+ if (cm->current_video_frame > 0) {int tmp_err, motion_error, raw_motion_error;
// Assume 0,0 motion with no mv overhead.
MV mv = { 0, 0 }, tmp_mv = { 0, 0 };@@ -1113,7 +1082,7 @@
#endif // CONFIG_VP9_HIGHBITDEPTH
// TODO(pengchong): Replace the hard-coded threshold
- if (raw_motion_error > 25 || lc != NULL) {+ if (raw_motion_error > 25) {// Test last reference frame using the previous best mv as the
// starting point (best reference) for the search.
first_pass_motion_search(cpi, x, best_ref_mv, &mv, &motion_error);
@@ -1131,9 +1100,7 @@
}
// Search in an older reference frame.
- if (((lc == NULL && cm->current_video_frame > 1) ||
- (lc != NULL && lc->current_video_frame_in_layer > 1)) &&
- gld_yv12 != NULL) {+ if ((cm->current_video_frame > 1) && gld_yv12 != NULL) {// Assume 0,0 motion with no mv overhead.
int gf_motion_error;
@@ -1371,9 +1338,6 @@
YV12_BUFFER_CONFIG *const new_yv12 = get_frame_new_buffer(cm);
const YV12_BUFFER_CONFIG *first_ref_buf = lst_yv12;
- LAYER_CONTEXT *const lc =
- is_two_pass_svc(cpi) ? &cpi->svc.layer_context[cpi->svc.spatial_layer_id]
- : NULL;
BufferPool *const pool = cm->buffer_pool;
FIRSTPASS_DATA fp_temp_data;
@@ -1385,7 +1349,7 @@
// First pass code requires valid last and new frame buffers.
assert(new_yv12 != NULL);
- assert((lc != NULL) || frame_is_intra_only(cm) || (lst_yv12 != NULL));
+ assert(frame_is_intra_only(cm) || (lst_yv12 != NULL));
#if CONFIG_FP_MB_STATS
if (cpi->use_fp_mb_stats) {@@ -1396,50 +1360,6 @@
set_first_pass_params(cpi);
vp9_set_quantizer(cm, find_fp_qindex(cm->bit_depth));
- if (lc != NULL) {- twopass = &lc->twopass;
-
- cpi->lst_fb_idx = cpi->svc.spatial_layer_id;
- cpi->ref_frame_flags = VP9_LAST_FLAG;
-
- if (cpi->svc.number_spatial_layers + cpi->svc.spatial_layer_id <
- REF_FRAMES) {- cpi->gld_fb_idx =
- cpi->svc.number_spatial_layers + cpi->svc.spatial_layer_id;
- cpi->ref_frame_flags |= VP9_GOLD_FLAG;
- cpi->refresh_golden_frame = (lc->current_video_frame_in_layer == 0);
- } else {- cpi->refresh_golden_frame = 0;
- }
-
- if (lc->current_video_frame_in_layer == 0) cpi->ref_frame_flags = 0;
-
- vp9_scale_references(cpi);
-
- // Use either last frame or alt frame for motion search.
- if (cpi->ref_frame_flags & VP9_LAST_FLAG) {- first_ref_buf = vp9_get_scaled_ref_frame(cpi, LAST_FRAME);
- if (first_ref_buf == NULL)
- first_ref_buf = get_ref_frame_buffer(cpi, LAST_FRAME);
- }
-
- if (cpi->ref_frame_flags & VP9_GOLD_FLAG) {- gld_yv12 = vp9_get_scaled_ref_frame(cpi, GOLDEN_FRAME);
- if (gld_yv12 == NULL) {- gld_yv12 = get_ref_frame_buffer(cpi, GOLDEN_FRAME);
- }
- } else {- gld_yv12 = NULL;
- }
-
- set_ref_ptrs(cm, xd,
- (cpi->ref_frame_flags & VP9_LAST_FLAG) ? LAST_FRAME : NONE,
- (cpi->ref_frame_flags & VP9_GOLD_FLAG) ? GOLDEN_FRAME : NONE);
-
- cpi->Source = vp9_scale_if_required(cm, cpi->un_scaled_source,
- &cpi->scaled_source, 0, EIGHTTAP, 0);
- }
-
vp9_setup_block_planes(&x->e_mbd, cm->subsampling_x, cm->subsampling_y);
vp9_setup_src_planes(x, cpi->Source, 0, 0);
@@ -1523,18 +1443,13 @@
vpx_extend_frame_borders(new_yv12);
- if (lc != NULL) {- vp9_update_reference_frames(cpi);
- } else {- // The frame we just compressed now becomes the last frame.
- ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->lst_fb_idx],
- cm->new_fb_idx);
- }
+ // The frame we just compressed now becomes the last frame.
+ ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->lst_fb_idx],
+ cm->new_fb_idx);
// Special case for the first frame. Copy into the GF buffer as a second
// reference.
- if (cm->current_video_frame == 0 && cpi->gld_fb_idx != INVALID_IDX &&
- lc == NULL) {+ if (cm->current_video_frame == 0 && cpi->gld_fb_idx != INVALID_IDX) {ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->gld_fb_idx],
cm->ref_frame_map[cpi->lst_fb_idx]);
}
@@ -1708,14 +1623,9 @@
}
void vp9_init_second_pass(VP9_COMP *cpi) {- SVC *const svc = &cpi->svc;
VP9EncoderConfig *const oxcf = &cpi->oxcf;
- const int is_two_pass_svc =
- (svc->number_spatial_layers > 1) || (svc->number_temporal_layers > 1);
RATE_CONTROL *const rc = &cpi->rc;
- TWO_PASS *const twopass =
- is_two_pass_svc ? &svc->layer_context[svc->spatial_layer_id].twopass
- : &cpi->twopass;
+ TWO_PASS *const twopass = &cpi->twopass;
double frame_rate;
FIRSTPASS_STATS *stats;
@@ -1792,19 +1702,10 @@
// encoded in the second pass is a guess. However, the sum duration is not.
// It is calculated based on the actual durations of all frames from the
// first pass.
+ vp9_new_framerate(cpi, frame_rate);
+ twopass->bits_left =
+ (int64_t)(stats->duration * oxcf->target_bandwidth / 10000000.0);
- if (is_two_pass_svc) {- vp9_update_spatial_layer_framerate(cpi, frame_rate);
- twopass->bits_left =
- (int64_t)(stats->duration *
- svc->layer_context[svc->spatial_layer_id].target_bandwidth /
- 10000000.0);
- } else {- vp9_new_framerate(cpi, frame_rate);
- twopass->bits_left =
- (int64_t)(stats->duration * oxcf->target_bandwidth / 10000000.0);
- }
-
// This variable monitors how far behind the second ref update is lagging.
twopass->sr_update_lag = 1;
@@ -2241,8 +2142,6 @@
int mid_frame_idx;
unsigned char arf_buffer_indices[MAX_ACTIVE_ARFS];
int alt_frame_index = frame_index;
- int has_temporal_layers =
- is_two_pass_svc(cpi) && cpi->svc.number_temporal_layers > 1;
int normal_frames;
int normal_frame_bits;
int last_frame_reduction = 0;
@@ -2250,12 +2149,8 @@
double tot_norm_frame_score = 1.0;
double this_frame_score = 1.0;
- // Only encode alt reference frame in temporal base layer.
- if (has_temporal_layers) alt_frame_index = cpi->svc.number_temporal_layers;
+ key_frame = cpi->common.frame_type == KEY_FRAME;
- key_frame =
- cpi->common.frame_type == KEY_FRAME || vp9_is_upper_layer_key_frame(cpi);
-
get_arf_buffer_indices(arf_buffer_indices);
// For key frames the frame target rate is already set and it
@@ -2284,19 +2179,14 @@
gf_group->rf_level[alt_frame_index] = GF_ARF_STD;
gf_group->bit_allocation[alt_frame_index] = gf_arf_bits;
- if (has_temporal_layers)
- gf_group->arf_src_offset[alt_frame_index] =
- (unsigned char)(rc->baseline_gf_interval -
- cpi->svc.number_temporal_layers);
- else
- gf_group->arf_src_offset[alt_frame_index] =
- (unsigned char)(rc->baseline_gf_interval - 1);
+ gf_group->arf_src_offset[alt_frame_index] =
+ (unsigned char)(rc->baseline_gf_interval - 1);
gf_group->arf_update_idx[alt_frame_index] = arf_buffer_indices[0];
gf_group->arf_ref_idx[alt_frame_index] =
arf_buffer_indices[cpi->multi_arf_last_grp_enabled &&
rc->source_alt_ref_active];
- if (!has_temporal_layers) ++frame_index;
+ ++frame_index;
if (cpi->multi_arf_enabled) {// Set aside a slot for a level 1 arf.
@@ -2332,11 +2222,6 @@
for (i = 0; i < normal_frames; ++i) {int arf_idx = 0;
if (EOF == input_stats(twopass, &frame_stats)) break;
-
- if (has_temporal_layers && frame_index == alt_frame_index) {- ++frame_index;
- }
-
if (oxcf->vbr_corpus_complexity) {this_frame_score = calculate_norm_frame_score(cpi, twopass, oxcf,
&frame_stats, av_score);
@@ -2639,27 +2524,6 @@
? (i - (is_key_frame || rc->source_alt_ref_pending))
: i;
- // Only encode alt reference frame in temporal base layer. So
- // baseline_gf_interval should be multiple of a temporal layer group
- // (typically the frame distance between two base layer frames)
- if (is_two_pass_svc(cpi) && cpi->svc.number_temporal_layers > 1) {- int count = (1 << (cpi->svc.number_temporal_layers - 1)) - 1;
- int new_gf_interval = (rc->baseline_gf_interval + count) & (~count);
- int j;
- for (j = 0; j < new_gf_interval - rc->baseline_gf_interval; ++j) {- if (EOF == input_stats(twopass, this_frame)) break;
- gf_group_err +=
- calculate_norm_frame_score(cpi, twopass, oxcf, this_frame, av_err);
- gf_group_raw_error += this_frame->coded_error;
- gf_group_noise += this_frame->frame_noise_energy;
- gf_group_skip_pct += this_frame->intra_skip_pct;
- gf_group_inactive_zone_rows += this_frame->inactive_zone_rows;
- gf_group_inter += this_frame->pcnt_inter;
- gf_group_motion += this_frame->pcnt_motion;
- }
- rc->baseline_gf_interval = new_gf_interval;
- }
-
rc->frames_till_gf_update_due = rc->baseline_gf_interval;
// Reset the file position.
@@ -3010,18 +2874,6 @@
rc->next_key_frame_forced = 0;
}
- if (is_two_pass_svc(cpi) && cpi->svc.number_temporal_layers > 1) {- int count = (1 << (cpi->svc.number_temporal_layers - 1)) - 1;
- int new_frame_to_key = (rc->frames_to_key + count) & (~count);
- int j;
- for (j = 0; j < new_frame_to_key - rc->frames_to_key; ++j) {- if (EOF == input_stats(twopass, this_frame)) break;
- kf_group_err +=
- calculate_norm_frame_score(cpi, twopass, oxcf, this_frame, av_err);
- }
- rc->frames_to_key = new_frame_to_key;
- }
-
// Special case for the last key frame of the file.
if (twopass->stats_in >= twopass->stats_in_end) {// Accumulate kf group error.
@@ -3180,15 +3032,6 @@
break;
default: assert(0); break;
}
- if (is_two_pass_svc(cpi)) {- if (cpi->svc.temporal_layer_id > 0) {- cpi->refresh_last_frame = 0;
- cpi->refresh_golden_frame = 0;
- }
- if (cpi->svc.layer_context[cpi->svc.spatial_layer_id].gold_ref_idx < 0)
- cpi->refresh_golden_frame = 0;
- if (cpi->alt_ref_source == NULL) cpi->refresh_alt_ref_frame = 0;
- }
}
static int is_skippable_frame(const VP9_COMP *cpi) {@@ -3196,10 +3039,7 @@
// first pass, and so do its previous and forward frames, then this frame
// can be skipped for partition check, and the partition size is assigned
// according to the variance
- const SVC *const svc = &cpi->svc;
- const TWO_PASS *const twopass =
- is_two_pass_svc(cpi) ? &svc->layer_context[svc->spatial_layer_id].twopass
- : &cpi->twopass;
+ const TWO_PASS *const twopass = &cpi->twopass;
return (!frame_is_intra_only(&cpi->common) &&
twopass->stats_in - 2 > twopass->stats_in_start &&
@@ -3221,9 +3061,6 @@
FIRSTPASS_STATS this_frame;
int target_rate;
- LAYER_CONTEXT *const lc =
- is_two_pass_svc(cpi) ? &cpi->svc.layer_context[cpi->svc.spatial_layer_id]
- : 0;
if (!twopass->stats_in) return;
@@ -3238,20 +3075,10 @@
cm->frame_type = INTER_FRAME;
- if (lc != NULL) {- if (cpi->svc.spatial_layer_id == 0) {- lc->is_key_frame = 0;
- } else {- lc->is_key_frame = cpi->svc.layer_context[0].is_key_frame;
-
- if (lc->is_key_frame) cpi->ref_frame_flags &= (~VP9_LAST_FLAG);
- }
- }
-
// Do the firstpass stats indicate that this frame is skippable for the
// partition search?
if (cpi->sf.allow_partition_search_skip && cpi->oxcf.pass == 2 &&
- (!cpi->use_svc || is_two_pass_svc(cpi))) {+ !cpi->use_svc) {cpi->partition_search_skippable_frame = is_skippable_frame(cpi);
}
@@ -3262,12 +3089,9 @@
if (cpi->oxcf.rc_mode == VPX_Q) {twopass->active_worst_quality = cpi->oxcf.cq_level;
- } else if (cm->current_video_frame == 0 ||
- (lc != NULL && lc->current_video_frame_in_layer == 0)) {+ } else if (cm->current_video_frame == 0) {const int frames_left =
- (int)(twopass->total_stats.count -
- ((lc != NULL) ? lc->current_video_frame_in_layer
- : cm->current_video_frame));
+ (int)(twopass->total_stats.count - cm->current_video_frame);
// Special case code for first frame.
const int section_target_bandwidth =
(int)(twopass->bits_left / frames_left);
@@ -3316,33 +3140,11 @@
cm->frame_type = INTER_FRAME;
}
- if (lc != NULL) {- if (cpi->svc.spatial_layer_id == 0) {- lc->is_key_frame = (cm->frame_type == KEY_FRAME);
- if (lc->is_key_frame) {- cpi->ref_frame_flags &=
- (~VP9_LAST_FLAG & ~VP9_GOLD_FLAG & ~VP9_ALT_FLAG);
- lc->frames_from_key_frame = 0;
- // Encode an intra only empty frame since we have a key frame.
- cpi->svc.encode_intra_empty_frame = 1;
- }
- } else {- cm->frame_type = INTER_FRAME;
- lc->is_key_frame = cpi->svc.layer_context[0].is_key_frame;
-
- if (lc->is_key_frame) {- cpi->ref_frame_flags &= (~VP9_LAST_FLAG);
- lc->frames_from_key_frame = 0;
- }
- }
- }
-
// Define a new GF/ARF group. (Should always enter here for key frames).
if (rc->frames_till_gf_update_due == 0) {define_gf_group(cpi, &this_frame);
rc->frames_till_gf_update_due = rc->baseline_gf_interval;
- if (lc != NULL) cpi->refresh_golden_frame = 1;
#if ARF_STATS_OUTPUT
{@@ -3363,7 +3165,7 @@
// Do the firstpass stats indicate that this frame is skippable for the
// partition search?
if (cpi->sf.allow_partition_search_skip && cpi->oxcf.pass == 2 &&
- (!cpi->use_svc || is_two_pass_svc(cpi))) {+ !cpi->use_svc) {cpi->partition_search_skippable_frame = is_skippable_frame(cpi);
}
@@ -3409,8 +3211,7 @@
rc->rate_error_estimate = 0;
}
- if (cpi->common.frame_type != KEY_FRAME &&
- !vp9_is_upper_layer_key_frame(cpi)) {+ if (cpi->common.frame_type != KEY_FRAME) {twopass->kf_group_bits -= bits_used;
twopass->last_kfgroup_zeromotion_pct = twopass->kf_zeromotion_pct;
}
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -1097,7 +1097,7 @@
int *inter_minq;
ASSIGN_MINQ_TABLE(cm->bit_depth, inter_minq);
- if (frame_is_intra_only(cm) || vp9_is_upper_layer_key_frame(cpi)) {+ if (frame_is_intra_only(cm)) {// Handle the special case for key frames forced when we have reached
// the maximum key frame interval. Here force the Q to a range
// based on the ambient Q to reduce the risk of popping.
@@ -1213,9 +1213,8 @@
#if LIMIT_QRANGE_FOR_ALTREF_AND_KEY
vpx_clear_system_state();
// Static forced key frames Q restrictions dealt with elsewhere.
- if (!((frame_is_intra_only(cm) || vp9_is_upper_layer_key_frame(cpi))) ||
- !rc->this_key_frame_forced ||
- (cpi->twopass.last_kfgroup_zeromotion_pct < STATIC_MOTION_THRESH)) {+ if (!frame_is_intra_only(cm) || !rc->this_key_frame_forced ||
+ cpi->twopass.last_kfgroup_zeromotion_pct < STATIC_MOTION_THRESH) {int qdelta = vp9_frame_type_qdelta(cpi, gf_group->rf_level[gf_group->index],
active_worst_quality);
active_worst_quality =
@@ -1239,8 +1238,7 @@
if (oxcf->rc_mode == VPX_Q) {q = active_best_quality;
// Special case code to try and match quality with forced key frames.
- } else if ((frame_is_intra_only(cm) || vp9_is_upper_layer_key_frame(cpi)) &&
- rc->this_key_frame_forced) {+ } else if (frame_is_intra_only(cm) && rc->this_key_frame_forced) {// If static since last kf use better of last boosted and last kf q.
if (cpi->twopass.last_kfgroup_zeromotion_pct >= STATIC_MOTION_THRESH) {q = VPXMIN(rc->last_kf_qindex, rc->last_boosted_qindex);
@@ -1488,7 +1486,7 @@
rc->total_target_vs_actual = rc->total_actual_bits - rc->total_target_bits;
- if (!cpi->use_svc || is_two_pass_svc(cpi)) {+ if (!cpi->use_svc) {if (is_altref_enabled(cpi) && cpi->refresh_alt_ref_frame &&
(cm->frame_type != KEY_FRAME))
// Update the alternate reference frame stats as appropriate.
@@ -1734,10 +1732,7 @@
cpi->svc.spatial_layer_id == 0)) {cm->frame_type = KEY_FRAME;
rc->source_alt_ref_active = 0;
- if (is_two_pass_svc(cpi)) {- cpi->svc.layer_context[layer].is_key_frame = 1;
- cpi->ref_frame_flags &= (~VP9_LAST_FLAG & ~VP9_GOLD_FLAG & ~VP9_ALT_FLAG);
- } else if (is_one_pass_cbr_svc(cpi)) {+ if (is_one_pass_cbr_svc(cpi)) {if (cm->current_video_frame > 0) vp9_svc_reset_key_frame(cpi);
layer = LAYER_IDS_TO_IDX(cpi->svc.spatial_layer_id,
cpi->svc.temporal_layer_id,
@@ -1750,17 +1745,7 @@
}
} else {cm->frame_type = INTER_FRAME;
- if (is_two_pass_svc(cpi)) {- LAYER_CONTEXT *lc = &cpi->svc.layer_context[layer];
- if (cpi->svc.spatial_layer_id == 0) {- lc->is_key_frame = 0;
- } else {- lc->is_key_frame =
- cpi->svc.layer_context[cpi->svc.temporal_layer_id].is_key_frame;
- if (lc->is_key_frame) cpi->ref_frame_flags &= (~VP9_LAST_FLAG);
- }
- cpi->ref_frame_flags &= (~VP9_ALT_FLAG);
- } else if (is_one_pass_cbr_svc(cpi)) {+ if (is_one_pass_cbr_svc(cpi)) {LAYER_CONTEXT *lc = &cpi->svc.layer_context[layer];
if (cpi->svc.spatial_layer_id == cpi->svc.first_spatial_layer_to_encode) {lc->is_key_frame = 0;
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -32,7 +32,7 @@
// Intra only frames, golden frames (except alt ref overlays) and
// alt ref frames tend to be coded at a higher than ambient quality
static int frame_is_boosted(const VP9_COMP *cpi) {- return frame_is_kf_gf_arf(cpi) || vp9_is_upper_layer_key_frame(cpi);
+ return frame_is_kf_gf_arf(cpi);
}
// Sets a partition size down to which the auto partition code will always
--- a/vp9/encoder/vp9_svc_layercontext.c
+++ b/vp9/encoder/vp9_svc_layercontext.c
@@ -311,7 +311,7 @@
// Reset the frames_since_key and frames_to_key counters to their values
// before the layer restore. Keep these defined for the stream (not layer).
if (cpi->svc.number_temporal_layers > 1 ||
- (cpi->svc.number_spatial_layers > 1 && !is_two_pass_svc(cpi))) {+ cpi->svc.number_spatial_layers > 1) {cpi->rc.frames_since_key = old_frame_since_key;
cpi->rc.frames_to_key = old_frame_to_key;
}
@@ -387,15 +387,6 @@
++lc->frames_from_key_frame;
if (cpi->svc.spatial_layer_id == cpi->svc.number_spatial_layers - 1)
++cpi->svc.current_superframe;
-}
-
-int vp9_is_upper_layer_key_frame(const VP9_COMP *const cpi) {- return is_two_pass_svc(cpi) && cpi->svc.spatial_layer_id > 0 &&
- cpi->svc
- .layer_context[cpi->svc.spatial_layer_id *
- cpi->svc.number_temporal_layers +
- cpi->svc.temporal_layer_id]
- .is_key_frame;
}
void get_layer_resolution(const int width_org, const int height_org,
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -1074,23 +1074,11 @@
if (cpi->oxcf.pass == 2 && cpi->level_constraint.level_index >= 0 &&
!cpi->level_constraint.rc_config_updated) {- SVC *const svc = &cpi->svc;
- const int is_two_pass_svc =
- (svc->number_spatial_layers > 1) || (svc->number_temporal_layers > 1);
const VP9EncoderConfig *const oxcf = &cpi->oxcf;
TWO_PASS *const twopass = &cpi->twopass;
FIRSTPASS_STATS *stats = &twopass->total_stats;
- if (is_two_pass_svc) {- const double frame_rate = 10000000.0 * stats->count / stats->duration;
- vp9_update_spatial_layer_framerate(cpi, frame_rate);
- twopass->bits_left =
- (int64_t)(stats->duration *
- svc->layer_context[svc->spatial_layer_id].target_bandwidth /
- 10000000.0);
- } else {- twopass->bits_left =
- (int64_t)(stats->duration * oxcf->target_bandwidth / 10000000.0);
- }
+ twopass->bits_left =
+ (int64_t)(stats->duration * oxcf->target_bandwidth / 10000000.0);
cpi->level_constraint.rc_config_updated = 1;
}
@@ -1460,9 +1448,6 @@
svc->first_spatial_layer_to_encode >= (int)ctx->cfg.ss_number_layers) {return VPX_CODEC_INVALID_PARAM;
}
- // First spatial layer to encode not implemented for two-pass.
- if (is_two_pass_svc(cpi) && svc->first_spatial_layer_to_encode > 0)
- return VPX_CODEC_INVALID_PARAM;
return VPX_CODEC_OK;
}