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

Merge "Remove unused functions"

Browse Source
This commit is contained in:
John Koleszar
2011-04-25 11:05:00 -07:00
committed by Code Review
parent cfbfd39de8 47bc1c7013
commit 1f32b1489c
2 changed files with 0 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
vp8/encoder/ratectrl.c
View File

@@ -662,8 +662,6 @@ void vp8_calc_pframe_target_size(VP8_COMP *cpi)
int min_frame_target;
int Adjustment;
// Set the min frame bandwidth.
//min_frame_target = estimate_min_frame_size( cpi );
min_frame_target = 0;
if (cpi->pass == 2)
@@ -1418,39 +1416,6 @@ int vp8_regulate_q(VP8_COMP *cpi, int target_bits_per_frame)
return Q;
}
static int estimate_min_frame_size(VP8_COMP *cpi)
{
double correction_factor;
int bits_per_mb_at_max_q;
// This funtion returns a default value for the first few frames untill the correction factor has had time to adapt.
if (cpi->common.current_video_frame < 10)
{
if (cpi->pass == 2)
return (cpi->min_frame_bandwidth);
else
return cpi->per_frame_bandwidth / 3;
}
/* // Select the appropriate correction factor based upon type of frame.
if ( cpi->common.frame_type == KEY_FRAME )
correction_factor = cpi->key_frame_rate_correction_factor;
else
{
if ( cpi->common.refresh_alt_ref_frame || cpi->common.refresh_golden_frame )
correction_factor = cpi->gf_rate_correction_factor;
else
correction_factor = cpi->rate_correction_factor;
}*/
// We estimate at half the value we get from vp8_bits_per_mb
correction_factor = cpi->rate_correction_factor / 2.0;
bits_per_mb_at_max_q = (int)(.5 + correction_factor * vp8_bits_per_mb[cpi->common.frame_type][MAXQ]);
return (bits_per_mb_at_max_q * cpi->common.MBs) >> BPER_MB_NORMBITS;
}
static int estimate_keyframe_frequency(VP8_COMP *cpi)
{