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

safety check to avoid divide by 0s

Browse Source
This commit is contained in:
Jim Bankoski
2010-10-14 16:19:06 -04:00
parent 0f5c63e4f6
commit 39f41a4f36
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vp8/encoder/onyx_if.c
View File

@@ -1420,6 +1420,9 @@ int vp8_reverse_trans(int x)
}; };
void vp8_new_frame_rate(VP8_COMP *cpi, double framerate) void vp8_new_frame_rate(VP8_COMP *cpi, double framerate)
{ {
if(framerate < .1)
framerate = 30;
cpi->oxcf.frame_rate = framerate; cpi->oxcf.frame_rate = framerate;
cpi->output_frame_rate = cpi->oxcf.frame_rate; cpi->output_frame_rate = cpi->oxcf.frame_rate;
cpi->per_frame_bandwidth = (int)(cpi->oxcf.target_bandwidth / cpi->output_frame_rate); cpi->per_frame_bandwidth = (int)(cpi->oxcf.target_bandwidth / cpi->output_frame_rate);

2
vp8/encoder/ratectrl.c
View File

@@ -1481,6 +1481,8 @@ void vp8_adjust_key_frame_context(VP8_COMP *cpi)
// allocated than those following other gfs. // allocated than those following other gfs.
cpi->kf_overspend_bits += (cpi->projected_frame_size - cpi->per_frame_bandwidth) * 7 / 8; cpi->kf_overspend_bits += (cpi->projected_frame_size - cpi->per_frame_bandwidth) * 7 / 8;
cpi->gf_overspend_bits += (cpi->projected_frame_size - cpi->per_frame_bandwidth) * 1 / 8; cpi->gf_overspend_bits += (cpi->projected_frame_size - cpi->per_frame_bandwidth) * 1 / 8;
if(!av_key_frame_frequency)
av_key_frame_frequency = 60;
// Work out how much to try and recover per frame. // Work out how much to try and recover per frame.
// For one pass we estimate the number of frames to spread it over based upon past history. // For one pass we estimate the number of frames to spread it over based upon past history.