diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-05 00:05:07 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-05 00:05:07 -0500 |
| commit | 01eb7c28742e907500279cff53184361a26e0847 (patch) | |
| tree | 410fa1302933ce402648d4a1d8cccb7130fe4f78 /vp8/encoder | |
| parent | 2c5638334ecb4fafc1ea9790ddf493d8d083ee4a (diff) | |
| parent | 3fae3283e6037a0b20f5e32402ba8e50d7ef859e (diff) | |
| download | libvpx-01eb7c28742e907500279cff53184361a26e0847.tar libvpx-01eb7c28742e907500279cff53184361a26e0847.tar.gz libvpx-01eb7c28742e907500279cff53184361a26e0847.tar.bz2 libvpx-01eb7c28742e907500279cff53184361a26e0847.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I70ac5a4f8388a7bfa058178c0ae53f6bdb0bb6e5
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/firstpass.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index 0fe85494d..d489413f6 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -2494,7 +2494,7 @@ void vp8_find_next_key_frame(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame) } // Calculate the number of bits that should be assigned to the kf group. - if ((cpi->bits_left > 0) && ((int)cpi->modified_error_left > 0)) + if ((cpi->bits_left > 0) && (cpi->modified_error_left > 0.0)) { // Max for a single normal frame (not key frame) int max_bits = frame_max_bits(cpi); diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 0a4a9a099..510269a65 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -5305,9 +5305,12 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon { long long nanosecs = cpi->source_end_time_stamp - cpi->last_end_time_stamp_seen; - double this_fps = 10000000.000 / nanosecs; - vp8_new_frame_rate(cpi, (7 * cpi->oxcf.frame_rate + this_fps) / 8); + if (nanosecs > 0) + { + double this_fps = 10000000.000 / nanosecs; + vp8_new_frame_rate(cpi, (7 * cpi->oxcf.frame_rate + this_fps) / 8); + } } |