Merge changes from topic "am-bcb09242-ce3f-453e-a1ab-496ff9dcb274" into oc-dev am: 73c9deaf77 am: 67952b520e

am: f83f69d802

Change-Id: Ic0cdd64a9fb19e0cce68bf76604c307d0573e92a

media/libstagefright/VideoFrameScheduler.cpp

@@ -129,6 +129,11 @@ bool VideoFrameScheduler::PLL::fit(
         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;