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

bug fix possible keyframe context divide by zero

Browse Source 
vp8_adjust_key_frame_context() divides by
estimate_keyframe_frequency() which can
return 0 in the case where --kf-max-dist=0.

Change-Id: Idfc59653478a0073187cd2aa420e98a321103daa
This commit is contained in:
James Berry
2011-04-22 11:54:18 -04:00
parent 496bcbb0de
commit 8d5ce819dd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vp8/encoder/ratectrl.c
View File

@@ -1468,8 +1468,10 @@ static int estimate_keyframe_frequency(VP8_COMP *cpi)
/* Assume a default of 1 kf every 2 seconds, or the max kf interval, /* Assume a default of 1 kf every 2 seconds, or the max kf interval,
* whichever is smaller. * whichever is smaller.
*/ */
int key_freq = cpi->oxcf.key_freq>0 ? cpi->oxcf.key_freq : 1;
av_key_frame_frequency = (int)cpi->output_frame_rate * 2; av_key_frame_frequency = (int)cpi->output_frame_rate * 2;
if (av_key_frame_frequency > cpi->oxcf.key_freq)
if (cpi->oxcf.auto_key && av_key_frame_frequency > key_freq)
av_key_frame_frequency = cpi->oxcf.key_freq; av_key_frame_frequency = cpi->oxcf.key_freq;
cpi->prior_key_frame_distance[KEY_FRAME_CONTEXT - 1] cpi->prior_key_frame_distance[KEY_FRAME_CONTEXT - 1]