diff options
| author | Debargha Mukherjee <debargha@google.com> | 2019-12-03 02:29:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-03 02:29:30 +0000 |
| commit | 89375f0315cf961493f535e900d35cb67d00d9e1 (patch) | |
| tree | f4ac3b9f520c74bbb752103a9724b9d1f6c39127 /vp8 | |
| parent | d2a5e26359bec7fd4137e9cd005ff39375afb41c (diff) | |
| parent | 5eeabfffcb9eb03d8f52693f6201380ec7110818 (diff) | |
| download | libvpx-89375f0315cf961493f535e900d35cb67d00d9e1.tar libvpx-89375f0315cf961493f535e900d35cb67d00d9e1.tar.gz libvpx-89375f0315cf961493f535e900d35cb67d00d9e1.tar.bz2 libvpx-89375f0315cf961493f535e900d35cb67d00d9e1.zip | |
Merge "Avoid dividing by 0 in vp8 gf_group bits compute"
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/firstpass.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index 72c9642fe..981c0fde3 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -2072,9 +2072,10 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame) { * score, otherwise it may be worse off than an "un-boosted" frame */ else { + // Avoid division by 0 by clamping cpi->twopass.kf_group_error_left to 1 int alt_gf_bits = (int)((double)cpi->twopass.kf_group_bits * mod_frame_err / - DOUBLE_DIVIDE_CHECK((double)cpi->twopass.kf_group_error_left)); + (double)VPXMAX(cpi->twopass.kf_group_error_left, 1)); if (alt_gf_bits > gf_bits) { gf_bits = alt_gf_bits; |