| commit | b9108baa01d2bbae57a804e46eea734c4fc3256f | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Fri Mar 09 20:27:30 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 20:27:30 2018 +0000 |
| tree | 82c7dc4065993f234a16551bfd30b042b31ef0b8 | |
| parent | 2228cdb20f86e11b1906de28686e1e2ca5230bc4 [diff] | |
| parent | c4a633e4f2da64e5d20901dcd0b6772c65f67eed [diff] |
Merge "fix null terminated string parsing" into pi-dev am: c4a633e4f2 Change-Id: I6b24176d1f52fe6dc53e19c3ebe732fd04ae66a2
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;