Merge "Adjust the max_gf_interval initialization" into experimental

This commit is contained in:
Yaowu Xu 2013-03-01 11:02:23 -08:00 committed by Gerrit Code Review
commit db4dc6f0c0

View File

@ -1068,10 +1068,7 @@ void vp9_new_frame_rate(VP9_COMP *cpi, double framerate) {
cpi->min_frame_bandwidth = FRAME_OVERHEAD_BITS;
// Set Maximum gf/arf interval
cpi->max_gf_interval = ((int)(cpi->output_frame_rate / 2.0) + 2);
if (cpi->max_gf_interval < 12)
cpi->max_gf_interval = 12;
cpi->max_gf_interval = 15;
// Extended interval for genuinely static scenes
cpi->twopass.static_scene_max_gf_interval = cpi->key_frame_frequency >> 1;