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

Merge "Avoid divide-by-zero in vp8 initialization"

Browse Source
This commit is contained in:
Johann 2014-11-04 14:28:45 -08:00 committed by Gerrit Code Review
commit 0593ce390d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vp8/encoder/onyx_if.c
View File

@ -1363,15 +1363,20 @@ static void init_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
cm->version = oxcf->Version; cm->version = oxcf->Version;
vp8_setup_version(cm); vp8_setup_version(cm);
/* frame rate is not available on the first frame, as it's derived from /* Frame rate is not available on the first frame, as it's derived from
* the observed timestamps. The actual value used here doesn't matter * the observed timestamps. The actual value used here doesn't matter
* too much, as it will adapt quickly. If the reciprocal of the timebase * too much, as it will adapt quickly.
* seems like a reasonable framerate, then use that as a guess, otherwise
* use 30.
*/ */
cpi->framerate = (double)(oxcf->timebase.den) / if (oxcf->timebase.num > 0) {
(double)(oxcf->timebase.num); cpi->framerate = (double)(oxcf->timebase.den) /
(double)(oxcf->timebase.num);
} else {
cpi->framerate = 30;
}
/* If the reciprocal of the timebase seems like a reasonable framerate,
* then use that as a guess, otherwise use 30.
*/
if (cpi->framerate > 180) if (cpi->framerate > 180)
cpi->framerate = 30; cpi->framerate = 30;