ref: b5bc9ee02dce7a129fa363d4f887dc41bb37c9fd
parent: a9b81da575f0ba8048783351540b1da9d96a3e1e
parent: d218b0914e9ec0ed3fe9e66a5953bafd48bb0c1d
author: James Zern <[email protected]>
date: Thu Feb 16 19:04:42 EST 2017
Merge "cosmetics: Fix spelling mistake in compile flag name."
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3312,7 +3312,7 @@
int frame_under_shoot_limit;
int q = 0, q_low = 0, q_high = 0;
int enable_acl;
-#ifdef AGRESSIVE_VBR
+#ifdef AGGRESSIVE_VBR
int qrange_adj = 1;
#endif
@@ -3330,7 +3330,7 @@
if (loop_count == 0 || cpi->resize_pending != 0) {set_size_dependent_vars(cpi, &q, &bottom_index, &top_index);
-#ifdef AGRESSIVE_VBR
+#ifdef AGGRESSIVE_VBR
if (two_pass_first_group_inter(cpi)) {// Adjustment limits for min and max q
qrange_adj = VPXMAX(1, (top_index - bottom_index) / 2);
@@ -3607,7 +3607,7 @@
if (loop || !enable_acl) restore_coding_context(cpi);
} while (loop);
-#ifdef AGRESSIVE_VBR
+#ifdef AGGRESSIVE_VBR
if (two_pass_first_group_inter(cpi)) {cpi->twopass.active_worst_quality =
VPXMIN(q + qrange_adj, cpi->oxcf.worst_allowed_q);
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -2478,7 +2478,7 @@
rc->source_alt_ref_pending = 0;
}
-#ifdef AGRESSIVE_VBR
+#ifdef AGGRESSIVE_VBR
// Limit maximum boost based on interval length.
rc->gfu_boost = VPXMIN((int)rc->gfu_boost, i * 140);
#else
@@ -2517,7 +2517,7 @@
gf_group_bits = calculate_total_gf_group_bits(cpi, gf_group_err);
// Calculate an estimate of the maxq needed for the group.
- // We are more agressive about correcting for sections
+ // We are more aggressive about correcting for sections
// where there could be significant overshoot than for easier
// sections where we do not wish to risk creating an overshoot
// of the allocated bit budget.
@@ -2689,7 +2689,7 @@
#define MIN_KF_TOT_BOOST 300
#define KF_BOOST_SCAN_MAX_FRAMES 32
-#ifdef AGRESSIVE_VBR
+#ifdef AGGRESSIVE_VBR
#define KF_MAX_FRAME_BOOST 80.0
#define MAX_KF_TOT_BOOST 4800
#else
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -93,7 +93,7 @@
static int rtc_minq_12[QINDEX_RANGE];
#endif
-#ifdef AGRESSIVE_VBR
+#ifdef AGGRESSIVE_VBR
static int gf_high = 2400;
static int gf_low = 400;
static int kf_high = 4000;
@@ -133,7 +133,7 @@
const double maxq = vp9_convert_qindex_to_q(i, bit_depth);
kf_low_m[i] = get_minq_index(maxq, 0.000001, -0.0004, 0.150, bit_depth);
kf_high_m[i] = get_minq_index(maxq, 0.0000021, -0.00125, 0.55, bit_depth);
-#ifdef AGRESSIVE_VBR
+#ifdef AGGRESSIVE_VBR
arfgf_low[i] = get_minq_index(maxq, 0.0000015, -0.0009, 0.275, bit_depth);
inter[i] = get_minq_index(maxq, 0.00000271, -0.00113, 0.80, bit_depth);
#else
--- a/vp9/encoder/vp9_ratectrl.h
+++ b/vp9/encoder/vp9_ratectrl.h
@@ -21,8 +21,8 @@
extern "C" {#endif
-// Used to control agressive VBR mode.
-// #define AGRESSIVE_VBR 1
+// Used to control aggressive VBR mode.
+// #define AGGRESSIVE_VBR 1
// Bits Per MB at different Q (Multiplied by 512)
#define BPER_MB_NORMBITS 9