| commit | 366f50cf7f422f05d6e260b54fdfd6c413a1ab48 | [log] [tgz] |
|---|---|---|
| author | Jaewan Kim <jaewan@google.com> | Thu Mar 08 11:45:07 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 08 11:45:07 2018 +0000 |
| tree | 7cbc4a0628e5de8d686e8b807d1b2be19660c3fc | |
| parent | aa93c2e1ed709351dc762806f318f7995929d734 [diff] | |
| parent | 8cf0d38498dd04ad3398b88acced533e1e919f3c [diff] |
Merge "MediaSession2: Add script to minimally run cts test" into pi-dev am: 8cf0d38498 Change-Id: If0ed2c305705aa3e81746d571cc00da920fc9d95
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;