commit 05fa245462238847528cd18e04aa77f85b0491a4
author Logan Chien <loganchien@google.com> Wed Mar 07 01:14:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 07 01:14:24 2018 +0000
tree e481968961ee8d8c22c7acb53d0d217e865bf4e4
parent 17771551063fccded1ce2dfa402e9e884d50a788
parent ff690f6cfa3717cf21e2394ed995e4ea911fafdf

Merge "Remove duplicated libdl from shared_libs"

camera/ndk/include/camera/NdkCameraMetadata.h

diff --git a/camera/ndk/include/camera/NdkCameraMetadata.h b/camera/ndk/include/camera/NdkCameraMetadata.h
index f2aec98..bdb1587 100644
--- a/camera/ndk/include/camera/NdkCameraMetadata.h
+++ b/camera/ndk/include/camera/NdkCameraMetadata.h
@@ -36,6 +36,7 @@
 #ifndef _NDK_CAMERA_METADATA_H
 #define _NDK_CAMERA_METADATA_H
 
+#include <stdint.h>
 #include <sys/cdefs.h>
 
 #include "NdkCameraError.h"

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;