| commit | bbefc87ddcccb10535eaad96345eb8b851482015 | [log] [tgz] |
|---|---|---|
| author | Hyundo Moon <hdmoon@google.com> | Fri Mar 09 14:23:00 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 14:23:00 2018 +0000 |
| tree | 8a2c4cb0d636c13da0d1f8c0afeeb4a572eeeca8 | |
| parent | e33a178a78e6816e7116a2a5321377a8d08733f6 [diff] | |
| parent | b3ee0c8ba072dc157a24263f0060d31e019a2810 [diff] |
Merge "MediaSession2: Remove tests from frameworks/av" into pi-dev am: b3ee0c8ba0 Change-Id: I18f1588608cd408489ef4ea51eabbab0f9a5efeb
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;