ref: 81649231985d4ae3840c3661913a7ea3805202de
parent: 4797ed2edbc4abed519ada7f65d1dcff9b4aa21e
parent: 84b2daa4223f660f3541eb0cc9351f85b23b4c40
author: Paul Wilkins <paulwilkins@google.com>
date: Wed Sep 12 07:01:20 EDT 2018
Merge changes I97111413,Idcd6dcbc * changes: Clean up define_gf_group() Clean up deprecated gop structure code
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -2120,220 +2120,6 @@
return score_total;
}
-static void define_gf_multi_arf_structure(VP9_COMP *cpi) {- RATE_CONTROL *const rc = &cpi->rc;
- TWO_PASS *const twopass = &cpi->twopass;
- GF_GROUP *const gf_group = &twopass->gf_group;
- int i;
- int frame_index = 0;
- const int key_frame = cpi->common.frame_type == KEY_FRAME;
-
- // The use of bi-predictive frames are only enabled when following 3
- // conditions are met:
- // (1) ALTREF is enabled;
- // (2) The bi-predictive group interval is at least 2; and
- // (3) The bi-predictive group interval is strictly smaller than the
- // golden group interval.
- const int is_bipred_enabled =
- cpi->extra_arf_allowed && rc->source_alt_ref_pending &&
- rc->bipred_group_interval &&
- rc->bipred_group_interval <=
- (rc->baseline_gf_interval - rc->source_alt_ref_pending);
- int bipred_group_end = 0;
- int bipred_frame_index = 0;
-
- const unsigned char ext_arf_interval =
- (unsigned char)(rc->baseline_gf_interval / (cpi->num_extra_arfs + 1) - 1);
- int which_arf = cpi->num_extra_arfs;
- int subgroup_interval[MAX_EXT_ARFS + 1];
- int is_sg_bipred_enabled = is_bipred_enabled;
- int accumulative_subgroup_interval = 0;
-
- // For key frames the frame target rate is already set and it
- // is also the golden frame.
- // === [frame_index == 0] ===
- if (!key_frame) {- if (rc->source_alt_ref_active) {- gf_group->update_type[frame_index] = OVERLAY_UPDATE;
- gf_group->rf_level[frame_index] = INTER_NORMAL;
- } else {- gf_group->update_type[frame_index] = GF_UPDATE;
- gf_group->rf_level[frame_index] = GF_ARF_STD;
- }
- gf_group->arf_update_idx[frame_index] = 0;
- gf_group->arf_ref_idx[frame_index] = 0;
- }
-
- gf_group->bidir_pred_enabled[frame_index] = 0;
- gf_group->brf_src_offset[frame_index] = 0;
-
- frame_index++;
-
- bipred_frame_index++;
-
- // === [frame_index == 1] ===
- if (rc->source_alt_ref_pending) {- gf_group->update_type[frame_index] = ARF_UPDATE;
- gf_group->rf_level[frame_index] = GF_ARF_STD;
- gf_group->arf_src_offset[frame_index] =
- (unsigned char)(rc->baseline_gf_interval - 1);
-
- gf_group->arf_update_idx[frame_index] = 0;
- gf_group->arf_ref_idx[frame_index] = 0;
-
- gf_group->bidir_pred_enabled[frame_index] = 0;
- gf_group->brf_src_offset[frame_index] = 0;
- // NOTE: "bidir_pred_frame_index" stays unchanged for ARF_UPDATE frames.
-
- // Work out the ARFs' positions in this gf group
- // NOTE: ALT_REFs' are indexed inversely, but coded in display order
- // (except for the original ARF). In the example of three ALT_REF's,
- // We index ALTREF's as: KEY ----- ALT2 ----- ALT1 ----- ALT0
- // but code them in the following order:
- // KEY-ALT0-ALT2 ----- OVERLAY2-ALT1 ----- OVERLAY1 ----- OVERLAY0
- //
- // arf_pos_for_ovrly[]: Position for OVERLAY
- // arf_pos_in_gf[]: Position for ALTREF
- cpi->arf_pos_for_ovrly[0] = frame_index + cpi->num_extra_arfs +
- gf_group->arf_src_offset[frame_index] + 1;
- for (i = 0; i < cpi->num_extra_arfs; ++i) {- cpi->arf_pos_for_ovrly[i + 1] =
- frame_index + (cpi->num_extra_arfs - i) * (ext_arf_interval + 2);
- subgroup_interval[i] = cpi->arf_pos_for_ovrly[i] -
- cpi->arf_pos_for_ovrly[i + 1] - (i == 0 ? 1 : 2);
- }
- subgroup_interval[cpi->num_extra_arfs] =
- cpi->arf_pos_for_ovrly[cpi->num_extra_arfs] - frame_index -
- (cpi->num_extra_arfs == 0 ? 1 : 2);
-
- ++frame_index;
-
- // Insert an extra ARF
- // === [frame_index == 2] ===
- if (cpi->num_extra_arfs) {- gf_group->update_type[frame_index] = INTNL_ARF_UPDATE;
- gf_group->rf_level[frame_index] = GF_ARF_LOW;
- gf_group->arf_src_offset[frame_index] = ext_arf_interval;
-
- gf_group->arf_update_idx[frame_index] = which_arf;
- gf_group->arf_ref_idx[frame_index] = 0;
- ++frame_index;
- }
- accumulative_subgroup_interval += subgroup_interval[cpi->num_extra_arfs];
- }
-
- for (i = 0; i < rc->baseline_gf_interval - rc->source_alt_ref_pending; ++i) {- gf_group->arf_update_idx[frame_index] = which_arf;
- gf_group->arf_ref_idx[frame_index] = which_arf;
-
- // If we are going to have ARFs, check whether we can have BWDREF in this
- // subgroup, and further, whether we can have ARF subgroup which contains
- // the BWDREF subgroup but contained within the GF group:
- //
- // GF group --> ARF subgroup --> BWDREF subgroup
- if (rc->source_alt_ref_pending) {- is_sg_bipred_enabled =
- is_bipred_enabled &&
- (subgroup_interval[which_arf] > rc->bipred_group_interval);
- }
-
- // NOTE: 1. BIDIR_PRED is only enabled when the length of the bi-predictive
- // frame group interval is strictly smaller than that of the GOLDEN
- // FRAME group interval.
- // 2. Currently BIDIR_PRED is only enabled when alt-ref is on.
- if (is_sg_bipred_enabled && !bipred_group_end) {- const int cur_brf_src_offset = rc->bipred_group_interval - 1;
-
- if (bipred_frame_index == 1) {- // --- BRF_UPDATE ---
- gf_group->update_type[frame_index] = BRF_UPDATE;
- gf_group->rf_level[frame_index] = GF_ARF_LOW;
- gf_group->brf_src_offset[frame_index] = cur_brf_src_offset;
- } else if (bipred_frame_index == rc->bipred_group_interval) {- // --- LAST_BIPRED_UPDATE ---
- gf_group->update_type[frame_index] = LAST_BIPRED_UPDATE;
- gf_group->rf_level[frame_index] = INTER_NORMAL;
- gf_group->brf_src_offset[frame_index] = 0;
-
- // Reset the bi-predictive frame index.
- bipred_frame_index = 0;
- } else {- // --- BIPRED_UPDATE ---
- gf_group->update_type[frame_index] = BIPRED_UPDATE;
- gf_group->rf_level[frame_index] = INTER_NORMAL;
- gf_group->brf_src_offset[frame_index] = 0;
- }
- gf_group->bidir_pred_enabled[frame_index] = 1;
-
- bipred_frame_index++;
- // Check whether the next bi-predictive frame group would entirely be
- // included within the current golden frame group.
- // In addition, we need to avoid coding a BRF right before an ARF.
- if (bipred_frame_index == 1 &&
- (i + 2 + cur_brf_src_offset) >= accumulative_subgroup_interval) {- bipred_group_end = 1;
- }
- } else {- gf_group->update_type[frame_index] = LF_UPDATE;
- gf_group->rf_level[frame_index] = INTER_NORMAL;
- gf_group->bidir_pred_enabled[frame_index] = 0;
- gf_group->brf_src_offset[frame_index] = 0;
- }
-
- ++frame_index;
-
- // Check if we need to update the ARF.
- if (is_sg_bipred_enabled && cpi->num_extra_arfs && which_arf > 0 &&
- frame_index > cpi->arf_pos_for_ovrly[which_arf]) {- --which_arf;
- accumulative_subgroup_interval += subgroup_interval[which_arf] + 1;
-
- // Meet the new subgroup; Reset the bipred_group_end flag.
- bipred_group_end = 0;
- // Insert another extra ARF after the overlay frame
- if (which_arf) {- gf_group->update_type[frame_index] = INTNL_ARF_UPDATE;
- gf_group->rf_level[frame_index] = GF_ARF_LOW;
- gf_group->arf_src_offset[frame_index] = ext_arf_interval;
-
- gf_group->arf_update_idx[frame_index] = which_arf;
- gf_group->arf_ref_idx[frame_index] = 0;
- ++frame_index;
- }
- }
- }
-
- // NOTE: We need to configure the frame at the end of the sequence + 1 that
- // is the start frame for the next group. Otherwise prior to the call to
- // av1_rc_get_second_pass_params() the data will be undefined.
- gf_group->arf_update_idx[frame_index] = 0;
- gf_group->arf_ref_idx[frame_index] = 0;
-
- if (rc->source_alt_ref_pending) {- gf_group->update_type[frame_index] = OVERLAY_UPDATE;
- gf_group->rf_level[frame_index] = INTER_NORMAL;
-
- cpi->arf_pos_in_gf[0] = 1;
- if (cpi->num_extra_arfs) {- // Overwrite the update_type for extra-ARF's corresponding internal
- // OVERLAY's: Change from LF_UPDATE to INTNL_OVERLAY_UPDATE.
- for (i = cpi->num_extra_arfs; i > 0; --i) {- cpi->arf_pos_in_gf[i] =
- (i == cpi->num_extra_arfs ? 2 : cpi->arf_pos_for_ovrly[i + 1] + 1);
-
- gf_group->update_type[cpi->arf_pos_for_ovrly[i]] = INTNL_OVERLAY_UPDATE;
- gf_group->rf_level[cpi->arf_pos_for_ovrly[i]] = INTER_NORMAL;
- }
- }
- } else {- gf_group->update_type[frame_index] = GF_UPDATE;
- gf_group->rf_level[frame_index] = GF_ARF_STD;
- }
-
- gf_group->bidir_pred_enabled[frame_index] = 0;
- gf_group->brf_src_offset[frame_index] = 0;
-}
-
static void find_arf_order(VP9_COMP *cpi, GF_GROUP *gf_group,
int *index_counter, int depth, int start, int end) {TWO_PASS *twopass = &cpi->twopass;
@@ -2513,151 +2299,6 @@
return frame_index;
}
-static void allocate_gf_multi_arf_bits(VP9_COMP *cpi, int64_t gf_group_bits,
- int gf_arf_bits) {- VP9EncoderConfig *const oxcf = &cpi->oxcf;
- RATE_CONTROL *const rc = &cpi->rc;
- TWO_PASS *const twopass = &cpi->twopass;
- GF_GROUP *const gf_group = &twopass->gf_group;
- FIRSTPASS_STATS frame_stats;
- int i;
- int frame_index = 0;
- int target_frame_size;
- int key_frame;
- const int max_bits = frame_max_bits(&cpi->rc, oxcf);
- int64_t total_group_bits = gf_group_bits;
- int normal_frames;
- int normal_frame_bits;
- int last_frame_reduction = 0;
- double av_score = 1.0;
- double tot_norm_frame_score = 1.0;
- double this_frame_score = 1.0;
-
- // Define the GF structure and specify
- define_gf_multi_arf_structure(cpi);
-
- //========================================
-
- key_frame = cpi->common.frame_type == KEY_FRAME;
-
- // For key frames the frame target rate is already set and it
- // is also the golden frame.
- // === [frame_index == 0] ===
- if (!key_frame) {- gf_group->bit_allocation[frame_index] =
- rc->source_alt_ref_active ? 0 : gf_arf_bits;
- }
-
- // Deduct the boost bits for arf (or gf if it is not a key frame)
- // from the group total.
- if (rc->source_alt_ref_pending || !key_frame) total_group_bits -= gf_arf_bits;
-
- ++frame_index;
-
- // === [frame_index == 1] ===
- // Store the bits to spend on the ARF if there is one.
- if (rc->source_alt_ref_pending) {- gf_group->bit_allocation[frame_index] = gf_arf_bits;
-
- ++frame_index;
-
- // Skip all the extra-ARF's right after ARF at the starting segment of
- // the current GF group.
- if (cpi->num_extra_arfs) {- while (gf_group->update_type[frame_index] == INTNL_ARF_UPDATE)
- ++frame_index;
- }
- }
-
- normal_frames = (rc->baseline_gf_interval - rc->source_alt_ref_pending);
- if (normal_frames > 1)
- normal_frame_bits = (int)(total_group_bits / normal_frames);
- else
- normal_frame_bits = (int)total_group_bits;
-
- if (oxcf->vbr_corpus_complexity) {- av_score = get_distribution_av_err(cpi, twopass);
- tot_norm_frame_score = calculate_group_score(cpi, av_score, normal_frames);
- }
-
- // Allocate bits to the other frames in the group.
- for (i = 0; i < normal_frames; ++i) {- if (EOF == input_stats(twopass, &frame_stats)) break;
-
- if (oxcf->vbr_corpus_complexity) {- this_frame_score = calculate_norm_frame_score(cpi, twopass, oxcf,
- &frame_stats, av_score);
- normal_frame_bits = (int)((double)total_group_bits *
- (this_frame_score / tot_norm_frame_score));
- }
-
- target_frame_size = normal_frame_bits;
- if ((i == (normal_frames - 1)) && (i >= 1)) {- last_frame_reduction = normal_frame_bits / 16;
- target_frame_size -= last_frame_reduction;
- }
-
- // TODO(zoeliu): Further check whether following is needed for
- // hierarchical GF group structure.
- if (rc->source_alt_ref_pending && cpi->multi_arf_enabled) {- target_frame_size -= (target_frame_size >> 4);
- }
-
- target_frame_size =
- clamp(target_frame_size, 0, VPXMIN(max_bits, (int)total_group_bits));
-
- if (gf_group->update_type[frame_index] == BRF_UPDATE) {- // Boost up the allocated bits on BWDREF_FRAME
- gf_group->bit_allocation[frame_index] =
- target_frame_size + (target_frame_size >> 2);
- } else if (gf_group->update_type[frame_index] == LAST_BIPRED_UPDATE) {- // Press down the allocated bits on LAST_BIPRED_UPDATE frames
- gf_group->bit_allocation[frame_index] =
- target_frame_size - (target_frame_size >> 1);
- } else if (gf_group->update_type[frame_index] == BIPRED_UPDATE) {- // TODO(zoeliu): Investigate whether the allocated bits on BIPRED_UPDATE
- // frames need to be further adjusted.
- gf_group->bit_allocation[frame_index] = target_frame_size;
- } else {- assert(gf_group->update_type[frame_index] == LF_UPDATE ||
- gf_group->update_type[frame_index] == INTNL_OVERLAY_UPDATE);
- gf_group->bit_allocation[frame_index] = target_frame_size;
- }
-
- ++frame_index;
-
- // Skip all the extra-ARF's.
- if (cpi->num_extra_arfs) {- while (gf_group->update_type[frame_index] == INTNL_ARF_UPDATE)
- ++frame_index;
- }
- }
-
- // NOTE: We need to configure the frame at the end of the sequence + 1 that
- // will be the start frame for the next group. Otherwise prior to the
- // call to av1_rc_get_second_pass_params() the data will be undefined.
- if (rc->source_alt_ref_pending) {- if (cpi->num_extra_arfs) {- // NOTE: For bit allocation, move the allocated bits associated with
- // INTNL_OVERLAY_UPDATE to the corresponding INTNL_ARF_UPDATE.
- // i > 0 for extra-ARF's and i == 0 for ARF:
- // arf_pos_for_ovrly[i]: Position for INTNL_OVERLAY_UPDATE
- // arf_pos_in_gf[i]: Position for INTNL_ARF_UPDATE
- for (i = cpi->num_extra_arfs; i > 0; --i) {- assert(gf_group->update_type[cpi->arf_pos_for_ovrly[i]] ==
- INTNL_OVERLAY_UPDATE);
-
- // Encoder's choice:
- // Set show_existing_frame == 1 for all extra-ARF's, and hence
- // allocate zero bit for both all internal OVERLAY frames.
- gf_group->bit_allocation[cpi->arf_pos_in_gf[i]] =
- gf_group->bit_allocation[cpi->arf_pos_for_ovrly[i]];
- gf_group->bit_allocation[cpi->arf_pos_for_ovrly[i]] = 0;
- }
- }
- }
-}
-
static void allocate_gf_group_bits(VP9_COMP *cpi, int64_t gf_group_bits,
int gf_arf_bits) {VP9EncoderConfig *const oxcf = &cpi->oxcf;
@@ -2887,8 +2528,6 @@
const int is_key_frame = frame_is_intra_only(cm);
const int arf_active_or_kf = is_key_frame || rc->source_alt_ref_active;
- int disable_bwd_extarf;
-
// Reset the GF group data structures unless this is a key
// frame in which case it will already have been done.
if (is_key_frame == 0) {@@ -3078,39 +2717,6 @@
rc->baseline_gf_interval = i - rc->source_alt_ref_pending;
- // TODO(zoeliu): Turn on the option to disable extra ALTREFs for still GF
- // groups.
- // Disable extra altrefs for "still" gf group:
- // zero_motion_accumulator: minimum percentage of (0,0) motion;
- // avg_sr_coded_error: average of the SSE per pixel of each frame;
- // avg_raw_err_stdev: average of the standard deviation of (0,0)
- // motion error per block of each frame.
-#if 0
- assert(num_mbs > 0);
- disable_bwd_extarf =
- (zero_motion_accumulator > MIN_ZERO_MOTION &&
- avg_sr_coded_error / num_mbs < MAX_SR_CODED_ERROR &&
- avg_raw_err_stdev < MAX_RAW_ERR_VAR);
-#else
- disable_bwd_extarf = 0;
-#endif // 0
-
- if (disable_bwd_extarf) cpi->extra_arf_allowed = 0;
-
- if (!cpi->extra_arf_allowed) {- cpi->num_extra_arfs = 0;
- } else {- // Compute how many extra alt_refs we can have
- cpi->num_extra_arfs = get_number_of_extra_arfs(rc->baseline_gf_interval,
- rc->source_alt_ref_pending);
- }
- // Currently at maximum two extra ARFs' are allowed
- assert(cpi->num_extra_arfs <= MAX_EXT_ARFS);
-
- rc->bipred_group_interval = BFG_INTERVAL;
- // The minimum bi-predictive frame group interval is 2.
- if (rc->bipred_group_interval < 2) rc->bipred_group_interval = 0;
-
// Reset the file position.
reset_fpf_position(twopass, start_pos);
@@ -3162,11 +2768,7 @@
twopass->kf_group_error_left -= gf_group_err;
// Allocate bits to each of the frames in the GF group.
- if (cpi->extra_arf_allowed) {- allocate_gf_multi_arf_bits(cpi, gf_group_bits, gf_arf_bits);
- } else {- allocate_gf_group_bits(cpi, gf_group_bits, gf_arf_bits);
- }
+ allocate_gf_group_bits(cpi, gf_group_bits, gf_arf_bits);
// Reset the file position.
reset_fpf_position(twopass, start_pos);