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

Merge "Clean up: unused function and variables"

Browse Source
This commit is contained in:
Paul Wilkins 2014-01-07 02:27:20 -08:00 committed by Gerrit Code Review
commit e4e58ac400
2 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
vp9/encoder/vp9_firstpass.c
View File

@ -961,31 +961,6 @@ static double calc_correction_factor(double err_per_mb,
return fclamp(pow(error_term, power_term), 0.05, 5.0); return fclamp(pow(error_term, power_term), 0.05, 5.0);
} }
// Given a current maxQ value sets a range for future values.
// PGW TODO..
// This code removes direct dependency on QIndex to determine the range
// (now uses the actual quantizer) but has not been tuned.
static void adjust_maxq_qrange(VP9_COMP *cpi) {
int i;
// Set the max corresponding to cpi->rc.avg_q * 2.0
double q = cpi->rc.avg_q * 2.0;
cpi->twopass.maxq_max_limit = cpi->rc.worst_quality;
for (i = cpi->rc.best_quality; i <= cpi->rc.worst_quality; i++) {
cpi->twopass.maxq_max_limit = i;
if (vp9_convert_qindex_to_q(i) >= q)
break;
}
// Set the min corresponding to cpi->rc.avg_q * 0.5
q = cpi->rc.avg_q * 0.5;
cpi->twopass.maxq_min_limit = cpi->rc.best_quality;
for (i = cpi->rc.worst_quality; i >= cpi->rc.best_quality; i--) {
cpi->twopass.maxq_min_limit = i;
if (vp9_convert_qindex_to_q(i) <= q)
break;
}
}
static int estimate_max_q(VP9_COMP *cpi, static int estimate_max_q(VP9_COMP *cpi,
FIRSTPASS_STATS *fpstats, FIRSTPASS_STATS *fpstats,
int section_target_bandwitdh) { int section_target_bandwitdh) {
@ -998,16 +973,15 @@ static int estimate_max_q(VP9_COMP *cpi,
double err_correction_factor; double err_correction_factor;
if (section_target_bandwitdh <= 0) if (section_target_bandwitdh <= 0)
return cpi->twopass.maxq_max_limit; // Highest value allowed return cpi->rc.worst_quality; // Highest value allowed
target_norm_bits_per_mb = section_target_bandwitdh < (1 << 20) target_norm_bits_per_mb = section_target_bandwitdh < (1 << 20)
? (512 * section_target_bandwitdh) / num_mbs ? (512 * section_target_bandwitdh) / num_mbs
: 512 * (section_target_bandwitdh / num_mbs); : 512 * (section_target_bandwitdh / num_mbs);
// Try and pick a max Q that will be high enough to encode the // Try and pick a max Q that will be high enough to encode the
// content at the given rate. // content at the given rate.
for (q = cpi->twopass.maxq_min_limit; q < cpi->twopass.maxq_max_limit; q++) { for (q = cpi->rc.best_quality; q < cpi->rc.worst_quality; q++) {
int bits_per_mb_at_this_q; int bits_per_mb_at_this_q;
err_correction_factor = calc_correction_factor(err_per_mb, err_correction_factor = calc_correction_factor(err_per_mb,
@ -2084,10 +2058,6 @@ void vp9_get_second_pass_params(VP9_COMP *cpi) {
int section_target_bandwidth = int section_target_bandwidth =
(int)(cpi->twopass.bits_left / frames_left); (int)(cpi->twopass.bits_left / frames_left);
// guess at maxq needed in 2nd pass
cpi->twopass.maxq_max_limit = cpi->rc.worst_quality;
cpi->twopass.maxq_min_limit = cpi->rc.best_quality;
tmp_q = estimate_max_q(cpi, &cpi->twopass.total_left_stats, tmp_q = estimate_max_q(cpi, &cpi->twopass.total_left_stats,
section_target_bandwidth); section_target_bandwidth);

2
vp9/encoder/vp9_onyx_int.h
View File

@ -531,8 +531,6 @@ typedef struct VP9_COMP {
double modified_error_left; double modified_error_left;
double kf_intra_err_min; double kf_intra_err_min;
double gf_intra_err_min; double gf_intra_err_min;
int maxq_max_limit;
int maxq_min_limit;
int static_scene_max_gf_interval; int static_scene_max_gf_interval;
int kf_bits; int kf_bits;
// Remaining error from uncoded frames in a gf group. Two pass use only // Remaining error from uncoded frames in a gf group. Two pass use only