Commit 741bd6df authored by paulwilkins's avatar paulwilkins
Browse files

Corpus Wide VBR test implementation.

This patch makes further changes to support an experimental
corpus wide VBR mode that uses a corpus complexity
number as the midpoint of the distribution used to allocate bits
within a clip, rather than some average error score derived from the
clip itself.

At the moment the midpoint number is hard wired for testing and
the mode is enabled or disabled through a #ifdef.  Ultimately this
would need to be controlled by command line parameters.

Change-Id: I9383b76ac9fc646eb35a5d2c5b7d8bc645bfa873
parent e1ae3772
......@@ -41,6 +41,11 @@
#define OUTPUT_FPF 0
#define ARF_STATS_OUTPUT 0
#define COMPLEXITY_STATS_OUTPUT 0
#ifdef CORPUS_VBR_EXPERIMENT
#define CORPUS_VBR_MIDPOINT 82.0
#endif
#define FIRST_PASS_Q 10.0
#define GF_MAX_BOOST 96.0
......@@ -239,8 +244,12 @@ static double calculate_active_area(const VP9_COMP *cpi,
static double get_distribution_av_err(TWO_PASS *const twopass) {
const double av_weight =
twopass->total_stats.weight / twopass->total_stats.count;
#ifdef CORPUS_VBR_EXPERIMENT
return av_weight * CORPUS_VBR_MIDPOINT;
#else
return (twopass->total_stats.coded_error * av_weight) /
twopass->total_stats.count;
#endif
}
// Calculate a modified Error used in distributing bits between easier and
......@@ -1686,7 +1695,7 @@ void calculate_coded_size(VP9_COMP *cpi, int *scaled_frame_width,
void vp9_init_second_pass(VP9_COMP *cpi) {
SVC *const svc = &cpi->svc;
const VP9EncoderConfig *const oxcf = &cpi->oxcf;
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;
......@@ -1706,28 +1715,6 @@ void vp9_init_second_pass(VP9_COMP *cpi) {
*stats = *twopass->stats_in_end;
twopass->total_left_stats = *stats;
frame_rate = 10000000.0 * stats->count / stats->duration;
// Each frame can have a different duration, as the frame rate in the source
// isn't guaranteed to be constant. The frame rate prior to the first frame
// 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.
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;
// Scan the first pass file and calculate a modified score for each
// frame that is used to distribute bits. The modified score is assumed
// to provide a linear basis for bit allocation. I.e a frame A with a score
......@@ -1737,6 +1724,9 @@ void vp9_init_second_pass(VP9_COMP *cpi) {
const FIRSTPASS_STATS *s = twopass->stats_in;
const double av_err = get_distribution_av_err(twopass);
#ifdef CORPUS_VBR_EXPERIMENT
twopass->mean_mod_score = CORPUS_VBR_MIDPOINT;
#else
// The first scan is unclamped and gives a raw average.
while (s < twopass->stats_in_end) {
modified_score_total += calculate_mod_frame_score(cpi, oxcf, s, av_err);
......@@ -1747,6 +1737,7 @@ void vp9_init_second_pass(VP9_COMP *cpi) {
// error for the rate distribution function.
twopass->mean_mod_score =
modified_score_total / DOUBLE_DIVIDE_CHECK(stats->count);
#endif
// Second scan using clamps based on the previous cycle average.
// This may modify the total and average somewhat but we dont bother with
......@@ -1759,8 +1750,47 @@ void vp9_init_second_pass(VP9_COMP *cpi) {
++s;
}
twopass->normalized_score_left = modified_score_total;
#ifdef CORPUS_VBR_EXPERIMENT
// If using Corpus wide VBR mode then update the clip target bandwidth.
oxcf->target_bandwidth =
(int64_t)((double)oxcf->target_bandwidth *
(twopass->normalized_score_left / stats->count));
#endif
#if COMPLEXITY_STATS_OUTPUT
{
FILE *compstats;
compstats = fopen("complexity_stats.stt", "a");
fprintf(compstats, "%10.3lf\n",
twopass->normalized_score_left / stats->count);
fclose(compstats);
}
#endif
}
frame_rate = 10000000.0 * stats->count / stats->duration;
// Each frame can have a different duration, as the frame rate in the source
// isn't guaranteed to be constant. The frame rate prior to the first frame
// 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.
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;
// Reset the vbr bits off target counters
rc->vbr_bits_off_target = 0;
rc->vbr_bits_off_target_fast = 0;
......
......@@ -1970,9 +1970,11 @@ void vp9_set_target_rate(VP9_COMP *cpi) {
else
target_rate = vp9_rc_clamp_pframe_target_size(cpi, target_rate);
#ifndef CORPUS_VBR_EXPERIMENT
// Correction to rate target based on prior over or under shoot.
if (cpi->oxcf.rc_mode == VPX_VBR || cpi->oxcf.rc_mode == VPX_CQ)
vbr_rate_correction(cpi, &target_rate);
#endif
vp9_rc_set_frame_target(cpi, target_rate);
}
......
......@@ -24,6 +24,9 @@ extern "C" {
// Used to control aggressive VBR mode.
// #define AGGRESSIVE_VBR 1
// Used to control Corpus VBR experiment
// #define CORPUS_VBR_EXPERIMENT 1
// Bits Per MB at different Q (Multiplied by 512)
#define BPER_MB_NORMBITS 9
......
......@@ -225,7 +225,11 @@ static void set_good_speed_feature_framesize_independent(VP9_COMP *cpi,
}
if (speed >= 2) {
#ifdef CORPUS_VBR_EXPERIMENT
sf->recode_loop = ALLOW_RECODE_FIRST;
#else
sf->recode_loop = ALLOW_RECODE_KFARFGF;
#endif
sf->tx_size_search_method =
frame_is_boosted(cpi) ? USE_FULL_RD : USE_LARGESTALL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment