diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-02-28 17:15:31 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-02-28 17:59:21 +0000 |
| commit | 25c127f5f006f9f3ae2df10819ee4499ee763155 (patch) | |
| tree | 57cb59bfaa867f3cc587b97949a64b8049764995 /vp8/encoder/firstpass.c | |
| parent | b6f02c85926b928f29b428e620b1c1ec70dd9d42 (diff) | |
| download | libvpx-25c127f5f006f9f3ae2df10819ee4499ee763155.tar libvpx-25c127f5f006f9f3ae2df10819ee4499ee763155.tar.gz libvpx-25c127f5f006f9f3ae2df10819ee4499ee763155.tar.bz2 libvpx-25c127f5f006f9f3ae2df10819ee4499ee763155.zip | |
Experimental branch code clean up.
Removal of some further code relating to partitions
and error resilience.
Spelling correction.
Change-Id: I36067aae67a4a23bec359541dda3400b0bbf26d0
Diffstat (limited to 'vp8/encoder/firstpass.c')
| -rw-r--r-- | vp8/encoder/firstpass.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index b5e81cd6e..7d9c38665 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -870,13 +870,13 @@ static long long estimate_modemvcost(VP8_COMP *cpi, } static double calc_correction_factor( double err_per_mb, - double err_devisor, + double err_divisor, double pt_low, double pt_high, int Q ) { double power_term; - double error_term = err_per_mb / err_devisor; + double error_term = err_per_mb / err_divisor; double correction_factor; // Adjustment based on actual quantizer to power term. @@ -926,7 +926,7 @@ static double adjust_maxq_qrange(VP8_COMP *cpi) break; } } -#define ERR_DEVISOR 150.0 +#define ERR_DIVISOR 150.0 static int estimate_max_q(VP8_COMP *cpi, FIRSTPASS_STATS * fpstats, int section_target_bandwitdh, @@ -1000,7 +1000,7 @@ static int estimate_max_q(VP8_COMP *cpi, // Error per MB based correction factor err_correction_factor = - calc_correction_factor(err_per_mb, ERR_DEVISOR, 0.36, 0.90, Q); + calc_correction_factor(err_per_mb, ERR_DIVISOR, 0.36, 0.90, Q); bits_per_mb_at_this_q = vp8_bits_per_mb(INTER_FRAME, Q) + overhead_bits_per_mb; @@ -1163,7 +1163,7 @@ static int estimate_q(VP8_COMP *cpi, double section_err, int section_target_band // Error per MB based correction factor err_correction_factor = - calc_correction_factor(err_per_mb, ERR_DEVISOR, 0.36, 0.90, Q); + calc_correction_factor(err_per_mb, ERR_DIVISOR, 0.36, 0.90, Q); bits_per_mb_at_this_q = (int)( .5 + ( err_correction_factor * @@ -1237,7 +1237,7 @@ static int estimate_kf_group_q(VP8_COMP *cpi, double section_err, int section_ta { // Error per MB based correction factor err_correction_factor = - calc_correction_factor(err_per_mb, ERR_DEVISOR, pow_lowq, pow_highq, Q); + calc_correction_factor(err_per_mb, ERR_DIVISOR, pow_lowq, pow_highq, Q); bits_per_mb_at_this_q = (int)(.5 + ( err_correction_factor * |