ref: 543ebc900f685d85c8c638c277666e1608c937e7
parent: 9216ba58d8ac1589a3d2b00276db3e030cf40e9b
parent: b89ba05ab45cfafaf92a95fda21b9e4c5142db88
author: Paul Wilkins <paulwilkins@google.com>
date: Thu Feb 16 05:01:57 EST 2017
Merge "Remove unnecessary factor."
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -43,7 +43,6 @@
#define ARF_STATS_OUTPUT 0
#define BOOST_BREAKOUT 12.5
-#define BOOST_FACTOR 12.5
#define FACTOR_PT_LOW 0.70
#define FACTOR_PT_HIGH 0.90
#define FIRST_PASS_Q 10.0
@@ -1843,7 +1842,7 @@
}
}
-#define BASELINE_ERR_PER_MB 1000.0
+#define BASELINE_ERR_PER_MB 12500.0
static double calc_frame_boost(VP9_COMP *cpi, const FIRSTPASS_STATS *this_frame,
double *sr_accumulator,
double this_frame_mv_in_out, double max_boost) {@@ -1872,12 +1871,12 @@
frame_boost += frame_boost * (this_frame_mv_in_out * 2.0);
// Q correction and scalling
- frame_boost = frame_boost * BOOST_FACTOR * boost_q_correction;
+ frame_boost = frame_boost * boost_q_correction;
return VPXMIN(frame_boost, max_boost * boost_q_correction);
}
-#define KF_BOOST_FACTOR 12.5
+#define KF_BASELINE_ERR_PER_MB 12500.0
static double calc_kf_frame_boost(VP9_COMP *cpi,
const FIRSTPASS_STATS *this_frame,
double *sr_accumulator,
@@ -1894,7 +1893,7 @@
num_mbs = (int)VPXMAX(1, num_mbs * calculate_active_area(cpi, this_frame));
// Underlying boost factor is based on inter error ratio.
- frame_boost = (BASELINE_ERR_PER_MB * num_mbs) /
+ frame_boost = (KF_BASELINE_ERR_PER_MB * num_mbs) /
DOUBLE_DIVIDE_CHECK(this_frame->coded_error + *sr_accumulator);
// Update the accumulator for second ref error difference.
@@ -1908,7 +1907,7 @@
frame_boost += frame_boost * (this_frame_mv_in_out * 2.0);
// Q correction and scalling
- frame_boost = frame_boost * KF_BOOST_FACTOR * boost_q_correction;
+ frame_boost = frame_boost * boost_q_correction;
return VPXMIN(frame_boost, max_boost * boost_q_correction);
}
@@ -2602,7 +2601,7 @@
// ratio in the next frame.
#define II_IMPROVEMENT_THRESHOLD 3.5
#define KF_II_MAX 128.0
-
+#define BOOST_FACTOR 12.5
static int test_candidate_kf(TWO_PASS *twopass,
const FIRSTPASS_STATS *last_frame,
const FIRSTPASS_STATS *this_frame,