| commit | f4f08c3307becefd226ef09c383b357ba1f5efad | [log] [tgz] |
|---|---|---|
| author | Ray Essick <essick@google.com> | Thu Mar 08 19:19:13 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 08 19:19:13 2018 +0000 |
| tree | 82c28756b4a06a9fd3c58e10a495fc3a65d399ec | |
| parent | 0596784d9a1bc679f1353a4dbc85880060fb68d8 [diff] | |
| parent | 6fd4657ec95d780d9ca8a89e5f16c1cc157a229e [diff] |
Merge changes from topic "am-3bd7761d-0a22-43c4-98aa-44bfc62874ad" into oc-dev am: e17682a20c am: 6c5e30f60c am: 4d4c461237 am: 6fd4657ec9 Change-Id: If4db35cd97b14656c2e4aa4e94d0ae87850cabff
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"
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;