| commit | 5e6a4c2380fd0ea15383fd0c3d19da7bb6e18804 | [log] [tgz] |
|---|---|---|
| author | Kevin Rocard <krocard@google.com> | Wed Mar 07 03:47:50 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 07 03:47:50 2018 +0000 |
| tree | ec93ead4b9d0d28f185c5184fa2989d6b0c23b02 | |
| parent | 2d3a1514d92f6e605a66b252e7426eeef1fedd8a [diff] | |
| parent | 20e21fd7110d016ef1a8bd01e0c9e092bf9ef193 [diff] |
Merge changes from topic "audio-hal-v4-pi-dev" into pi-dev am: 20e21fd711 Change-Id: I4634d7daf302479f4701ca90a23fdf3656bff506
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;