ref: e6c1993f1b0f876535e99661d48d395b1c4bf4b3
parent: b63e88e506a28b0e2814259c1af04ef319dac77b
parent: 945ccfee59fe2d1bde5fc3f30845a6e0503bec59
author: Paul Wilkins <paulwilkins@google.com>
date: Thu Feb 16 04:39:29 EST 2017
Merge "Additional first pass stats."
--- a/test/vp9_ethread_test.cc
+++ b/test/vp9_ethread_test.cc
@@ -21,12 +21,12 @@
namespace {// FIRSTPASS_STATS struct:
// {-// 23 double members;
+// 25 double members;
// 1 int64_t member;
// }
// Whenever FIRSTPASS_STATS struct is modified, the following constants need to
// be revisited.
-const int kDbl = 23;
+const int kDbl = 25;
const int kInt = 1;
const size_t kFirstPassStatsSz = kDbl * sizeof(double) + kInt * sizeof(int64_t);
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3335,10 +3335,10 @@
// Adjustment limits for min and max q
qrange_adj = VPXMAX(1, (top_index - bottom_index) / 2);
- bottom_index = VPXMAX(bottom_index - qrange_adj / 2,
- cpi->oxcf.best_allowed_q);
- top_index = VPXMIN(cpi->oxcf.worst_allowed_q,
- top_index + qrange_adj / 2);
+ bottom_index =
+ VPXMAX(bottom_index - qrange_adj / 2, cpi->oxcf.best_allowed_q);
+ top_index =
+ VPXMIN(cpi->oxcf.worst_allowed_q, top_index + qrange_adj / 2);
}
#endif
// TODO(agrange) Scale cpi->max_mv_magnitude if frame-size has changed.
@@ -3610,7 +3610,7 @@
#ifdef AGRESSIVE_VBR
if (two_pass_first_group_inter(cpi)) {cpi->twopass.active_worst_quality =
- VPXMIN(q + qrange_adj, cpi->oxcf.worst_allowed_q);
+ VPXMIN(q + qrange_adj, cpi->oxcf.worst_allowed_q);
}
#endif
--- a/vp9/encoder/vp9_ethread.c
+++ b/vp9/encoder/vp9_ethread.c
@@ -229,6 +229,8 @@
tile_data->fp_data.intercount += tile_data_t->fp_data.intercount;
tile_data->fp_data.second_ref_count += tile_data_t->fp_data.second_ref_count;
tile_data->fp_data.neutral_count += tile_data_t->fp_data.neutral_count;
+ tile_data->fp_data.intra_count_low += tile_data_t->fp_data.intra_count_low;
+ tile_data->fp_data.intra_count_high += tile_data_t->fp_data.intra_count_high;
tile_data->fp_data.intra_skip_count += tile_data_t->fp_data.intra_skip_count;
tile_data->fp_data.mvcount += tile_data_t->fp_data.mvcount;
tile_data->fp_data.sum_mvr += tile_data_t->fp_data.sum_mvr;
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -108,13 +108,15 @@
fpfile = fopen("firstpass.stt", "a");fprintf(fpfile,
- "%12.0lf %12.4lf %12.0lf %12.0lf %12.0lf %12.0lf %12.4lf"
+ "%12.0lf %12.4lf %12.0lf %12.0lf %12.0lf %12.0lf %12.4lf %12.4lf"
"%12.4lf %12.4lf %12.4lf %12.4lf %12.4lf %12.4lf %12.4lf %12.4lf"
- "%12.4lf %12.4lf %12.4lf %12.4lf %12.0lf %12.0lf %12.0lf %12.4lf"
+ "%12.4lf %12.4lf %12.4lf %12.4lf %12.4lf %12.0lf %12.0lf %12.0lf"
+ "%12.4lf"
"\n",
stats->frame, stats->weight, stats->intra_error, stats->coded_error,
stats->sr_coded_error, stats->frame_noise_energy, stats->pcnt_inter,
stats->pcnt_motion, stats->pcnt_second_ref, stats->pcnt_neutral,
+ stats->pcnt_intra_low, stats->pcnt_intra_high,
stats->intra_skip_pct, stats->intra_smooth_pct,
stats->inactive_zone_rows, stats->inactive_zone_cols, stats->MVr,
stats->mvr_abs, stats->MVc, stats->mvc_abs, stats->MVrv,
@@ -148,6 +150,8 @@
section->pcnt_neutral = 0.0;
section->intra_skip_pct = 0.0;
section->intra_smooth_pct = 0.0;
+ section->pcnt_intra_low = 0.0;
+ section->pcnt_intra_high = 0.0;
section->inactive_zone_rows = 0.0;
section->inactive_zone_cols = 0.0;
section->MVr = 0.0;
@@ -177,6 +181,8 @@
section->pcnt_neutral += frame->pcnt_neutral;
section->intra_skip_pct += frame->intra_skip_pct;
section->intra_smooth_pct += frame->intra_smooth_pct;
+ section->pcnt_intra_low += frame->pcnt_intra_low;
+ section->pcnt_intra_high += frame->pcnt_intra_high;
section->inactive_zone_rows += frame->inactive_zone_rows;
section->inactive_zone_cols += frame->inactive_zone_cols;
section->MVr += frame->MVr;
@@ -204,6 +210,8 @@
section->pcnt_neutral -= frame->pcnt_neutral;
section->intra_skip_pct -= frame->intra_skip_pct;
section->intra_smooth_pct -= frame->intra_smooth_pct;
+ section->pcnt_intra_low -= frame->pcnt_intra_low;
+ section->pcnt_intra_high -= frame->pcnt_intra_high;
section->inactive_zone_rows -= frame->inactive_zone_rows;
section->inactive_zone_cols -= frame->inactive_zone_cols;
section->MVr -= frame->MVr;
@@ -710,6 +718,8 @@
fps->pcnt_inter = (double)(fp_acc_data->intercount) / num_mbs;
fps->pcnt_second_ref = (double)(fp_acc_data->second_ref_count) / num_mbs;
fps->pcnt_neutral = (double)(fp_acc_data->neutral_count) / num_mbs;
+ fps->pcnt_intra_low = (double)(fp_acc_data->intra_count_low) / num_mbs;
+ fps->pcnt_intra_high = (double)(fp_acc_data->intra_count_high) / num_mbs;
fps->intra_skip_pct = (double)(fp_acc_data->intra_skip_count) / num_mbs;
fps->intra_smooth_pct = (double)(fp_acc_data->intra_smooth_count) / num_mbs;
fps->inactive_zone_rows = (double)(fp_acc_data->image_data_start_row);
@@ -755,6 +765,8 @@
this_tile->fp_data.intercount += fp_acc_data->intercount;
this_tile->fp_data.second_ref_count += fp_acc_data->second_ref_count;
this_tile->fp_data.neutral_count += fp_acc_data->neutral_count;
+ this_tile->fp_data.intra_count_low += fp_acc_data->intra_count_low;
+ this_tile->fp_data.intra_count_high += fp_acc_data->intra_count_high;
this_tile->fp_data.intra_skip_count += fp_acc_data->intra_skip_count;
this_tile->fp_data.mvcount += fp_acc_data->mvcount;
this_tile->fp_data.sum_mvr += fp_acc_data->sum_mvr;
@@ -1262,10 +1274,14 @@
fp_acc_data->frame_noise_energy += (int64_t)SECTION_NOISE_DEF;
}
} else { // Intra < inter error- if (this_intra_error < scale_sse_threshold(cm, LOW_I_THRESH))
+ int scaled_low_intra_thresh = scale_sse_threshold(cm, LOW_I_THRESH);
+ if (this_intra_error < scaled_low_intra_thresh) {fp_acc_data->frame_noise_energy += fp_estimate_block_noise(x, bsize);
- else
+ fp_acc_data->intra_count_low += 1.0;
+ } else {fp_acc_data->frame_noise_energy += (int64_t)SECTION_NOISE_DEF;
+ fp_acc_data->intra_count_high += 1.0;
+ }
}
} else {fp_acc_data->sr_coded_error += (int64_t)this_error;
@@ -2463,8 +2479,8 @@
rc->source_alt_ref_pending = 0;
}
- // Limit maximum boost based on interval length.
#ifdef AGRESSIVE_VBR
+ // Limit maximum boost based on interval length.
rc->gfu_boost = VPXMIN((int)rc->gfu_boost, i * 140);
#else
rc->gfu_boost = VPXMIN((int)rc->gfu_boost, i * 200);
--- a/vp9/encoder/vp9_firstpass.h
+++ b/vp9/encoder/vp9_firstpass.h
@@ -60,6 +60,8 @@
int intercount;
int second_ref_count;
double neutral_count;
+ double intra_count_low; // Coded intra but low variance
+ double intra_count_high; // Coded intra high variance
int intra_skip_count;
int image_data_start_row;
int mvcount;
@@ -84,6 +86,8 @@
double pcnt_motion;
double pcnt_second_ref;
double pcnt_neutral;
+ double pcnt_intra_low; // Coded intra but low variance
+ double pcnt_intra_high; // Coded intra high variance
double intra_skip_pct;
double intra_smooth_pct; // % of blocks that are smooth
double inactive_zone_rows; // Image mask rows top and bottom.