| commit | 67952b520eb12adb43f4432e318abc75f7a91e69 | [log] [tgz] |
|---|---|---|
| author | Ryszard Grzesica <ryszard.grzesica@sonymobile.com> | Wed Apr 11 16:28:34 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 11 16:28:34 2018 -0700 |
| tree | c0e3551d903b80d496fa654c127c27fb39dbf212 | |
| parent | 6f0501b853429c6f6de0168a68e31270e478a7fe [diff] | |
| parent | 73c9deaf778076c13547a6b533b38675fe218ebe [diff] |
Merge changes from topic "am-bcb09242-ce3f-453e-a1ab-496ff9dcb274" into oc-dev am: 73c9deaf77 Change-Id: I4c1fe63b943e8fcea398e4f3794ee676095d4853
diff --git a/media/libstagefright/VideoFrameScheduler.cpp b/media/libstagefright/VideoFrameScheduler.cpp index 03226c7..6819bba 100644 --- a/media/libstagefright/VideoFrameScheduler.cpp +++ b/media/libstagefright/VideoFrameScheduler.cpp
@@ -129,6 +129,11 @@ numSamplesToUse = mNumSamples; } + if ((period >> kPrecision) == 0 ) { + ALOGW("Period is 0, or after including precision is 0 - would cause div0, returning"); + return false; + } + int64_t sumX = 0; int64_t sumXX = 0; int64_t sumXY = 0;