diff options
Diffstat (limited to 'vp9/encoder')
-rw-r--r-- | vp9/encoder/vp9_encoder.c | 6 | ||||
-rw-r--r-- | vp9/encoder/vp9_firstpass.c | 6 | ||||
-rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_ratectrl.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 62742c9cb..c33da10a1 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -3312,7 +3312,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size, 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 @@ static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size, 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 @@ static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size, 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); diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index ed9447cc8..f95081c98 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -2478,7 +2478,7 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { 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 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { 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 @@ static int test_candidate_kf(TWO_PASS *twopass, #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 diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 4c4c20cde..906a3c400 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -93,7 +93,7 @@ static int inter_minq_12[QINDEX_RANGE]; 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 @@ static void init_minq_luts(int *kf_low_m, int *kf_high_m, int *arfgf_low, 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 diff --git a/vp9/encoder/vp9_ratectrl.h b/vp9/encoder/vp9_ratectrl.h index 7bd428e23..32353d38e 100644 --- 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 |