| commit | e64d563760f14358bbd708eae76f803934f3d939 | [log] [tgz] |
|---|---|---|
| author | Hyundo Moon <hdmoon@google.com> | Fri Mar 09 14:24:09 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 14:24:09 2018 +0000 |
| tree | e8243d0894535c5f1085face27e0ecedd87e5c47 | |
| parent | bbefc87ddcccb10535eaad96345eb8b851482015 [diff] | |
| parent | ecff3f95aece364d5b35600c6cfda1b04af52a7c [diff] |
Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev am: ecff3f95ae Change-Id: Id493a04e639f422d60e1a845958107ccd4b13056
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;