commit 73c9deaf778076c13547a6b533b38675fe218ebe
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 11 23:18:23 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 11 23:18:23 2018 +0000
tree bfbec2b8115538a505d9813dc3d490f06841e40f
parent cfefca44b027c24398c40d21f638f4b1e7a19f8e
parent 3cce04480208b7d355b0e43b5bbbd08c653c858d

Merge changes from topic "am-bcb09242-ce3f-453e-a1ab-496ff9dcb274" into oc-dev

* changes:
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324 am: a7d57f7a14 am: 19d80c34be am: 96fa1d1842 am: 1ed02297a9 am: 0b4dbc600b am: fc340cad0c
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324 am: a7d57f7a14 am: 19d80c34be am: 96fa1d1842 am: 1ed02297a9 am: 0b4dbc600b
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324 am: a7d57f7a14 am: 19d80c34be am: 96fa1d1842 am: 1ed02297a9
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324 am: a7d57f7a14 am: 19d80c34be am: 96fa1d1842
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324 am: a7d57f7a14 am: 19d80c34be
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324 am: a7d57f7a14
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262 am: fef8617324
  [automerger] Add check preventing div0 issue am: 27e47ce3c3 am: 357017a262
  [automerger] Add check preventing div0 issue am: 27e47ce3c3
  Add check preventing div0 issue

media/libstagefright/VideoFrameScheduler.cpp

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;