generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosmetics: Fix spelling mistake in compile flag name.

Browse Source 
agressive -> aggressive

after:
ce7b38459 Aggressive VBR method.

Change-Id: Ie0f30b1bbc77ed9f32bec047b4a9b3d0cf4853f5
This commit is contained in:
paulwilkins
2017-02-16 12:36:56 +00:00
committed by James Zern
parent 06a82af0de
commit d218b0914e
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_encoder.c
View File

@@ -3312,7 +3312,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size,
int frame_under_shoot_limit; int frame_under_shoot_limit;
int q = 0, q_low = 0, q_high = 0; int q = 0, q_low = 0, q_high = 0;
int enable_acl; int enable_acl;
#ifdef AGRESSIVE_VBR #ifdef AGGRESSIVE_VBR
int qrange_adj = 1; int qrange_adj = 1;
#endif #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) { if (loop_count == 0 || cpi->resize_pending != 0) {
set_size_dependent_vars(cpi, &q, &bottom_index, &top_index); set_size_dependent_vars(cpi, &q, &bottom_index, &top_index);
#ifdef AGRESSIVE_VBR #ifdef AGGRESSIVE_VBR
if (two_pass_first_group_inter(cpi)) { if (two_pass_first_group_inter(cpi)) {
// Adjustment limits for min and max q // Adjustment limits for min and max q
qrange_adj = VPXMAX(1, (top_index - bottom_index) / 2); 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); if (loop || !enable_acl) restore_coding_context(cpi);
} while (loop); } while (loop);
#ifdef AGRESSIVE_VBR #ifdef AGGRESSIVE_VBR
if (two_pass_first_group_inter(cpi)) { if (two_pass_first_group_inter(cpi)) {
cpi->twopass.active_worst_quality = cpi->twopass.active_worst_quality =
VPXMIN(q + qrange_adj, cpi->oxcf.worst_allowed_q); VPXMIN(q + qrange_adj, cpi->oxcf.worst_allowed_q);

6
vp9/encoder/vp9_firstpass.c
View File

@@ -2478,7 +2478,7 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
rc->source_alt_ref_pending = 0; rc->source_alt_ref_pending = 0;
} }
#ifdef AGRESSIVE_VBR #ifdef AGGRESSIVE_VBR
// Limit maximum boost based on interval length. // Limit maximum boost based on interval length.
rc->gfu_boost = VPXMIN((int)rc->gfu_boost, i * 140); rc->gfu_boost = VPXMIN((int)rc->gfu_boost, i * 140);
#else #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); gf_group_bits = calculate_total_gf_group_bits(cpi, gf_group_err);
// Calculate an estimate of the maxq needed for the group. // 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 // where there could be significant overshoot than for easier
// sections where we do not wish to risk creating an overshoot // sections where we do not wish to risk creating an overshoot
// of the allocated bit budget. // of the allocated bit budget.
@@ -2689,7 +2689,7 @@ static int test_candidate_kf(TWO_PASS *twopass,
#define MIN_KF_TOT_BOOST 300 #define MIN_KF_TOT_BOOST 300
#define KF_BOOST_SCAN_MAX_FRAMES 32 #define KF_BOOST_SCAN_MAX_FRAMES 32
#ifdef AGRESSIVE_VBR #ifdef AGGRESSIVE_VBR
#define KF_MAX_FRAME_BOOST 80.0 #define KF_MAX_FRAME_BOOST 80.0
#define MAX_KF_TOT_BOOST 4800 #define MAX_KF_TOT_BOOST 4800
#else #else

4
vp9/encoder/vp9_ratectrl.c
View File

@@ -93,7 +93,7 @@ static int inter_minq_12[QINDEX_RANGE];
static int rtc_minq_12[QINDEX_RANGE]; static int rtc_minq_12[QINDEX_RANGE];
#endif #endif
#ifdef AGRESSIVE_VBR #ifdef AGGRESSIVE_VBR
static int gf_high = 2400; static int gf_high = 2400;
static int gf_low = 400; static int gf_low = 400;
static int kf_high = 4000; 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); 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_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); 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); 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); inter[i] = get_minq_index(maxq, 0.00000271, -0.00113, 0.80, bit_depth);
#else #else

4
vp9/encoder/vp9_ratectrl.h
View File

@@ -21,8 +21,8 @@
extern "C" { extern "C" {
#endif #endif
// Used to control agressive VBR mode. // Used to control aggressive VBR mode.
// #define AGRESSIVE_VBR 1 // #define AGGRESSIVE_VBR 1
// Bits Per MB at different Q (Multiplied by 512) // Bits Per MB at different Q (Multiplied by 512)
#define BPER_MB_NORMBITS 9 #define BPER_MB_NORMBITS 9