generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "ARF Boost correction for inactive regions."

Browse Source
This commit is contained in:
paulwilkins
2015-07-07 08:44:15 +00:00
committed by Gerrit Code Review
parent 33a0deb928 e4702deeec
commit 00c0cbb445
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vp9/encoder/vp9_firstpass.c
View File

@@ -1450,15 +1450,21 @@ static double calc_frame_boost(VP9_COMP *cpi,
const FIRSTPASS_STATS *this_frame, const FIRSTPASS_STATS *this_frame,
double this_frame_mv_in_out, double this_frame_mv_in_out,
double max_boost) { double max_boost) {
VP9_COMMON *const cm = &cpi->common;
double frame_boost; double frame_boost;
const double lq = const double lq =
vp9_convert_qindex_to_q(cpi->rc.avg_frame_qindex[INTER_FRAME], vp9_convert_qindex_to_q(cpi->rc.avg_frame_qindex[INTER_FRAME],
cpi->common.bit_depth); cpi->common.bit_depth);
const double boost_q_correction = MIN((0.5 + (lq * 0.015)), 1.5); const double boost_q_correction = MIN((0.5 + (lq * 0.015)), 1.5);
const int num_mbs = (cpi->oxcf.resize_mode != RESIZE_NONE) double inactive_pct;
? cpi->initial_mbs : cpi->common.MBs; int num_mbs = (cpi->oxcf.resize_mode != RESIZE_NONE)
? cpi->initial_mbs : cpi->common.MBs;
// TODO(paulwilkins): correct for dead zone // Correct for any inactive zone in the image
inactive_pct = (this_frame->intra_skip_pct / 2) +
((this_frame->inactive_zone_rows * 2) / (double)cm->mb_rows);
inactive_pct = fclamp(inactive_pct, 0.0, 0.5);
num_mbs = (int)MAX(1, num_mbs - (num_mbs * inactive_pct));
// Underlying boost factor is based on inter error ratio. // Underlying boost factor is based on inter error ratio.
frame_boost = (BASELINE_ERR_PER_MB * num_mbs) / frame_boost = (BASELINE_ERR_PER_MB * num_mbs) /