| commit | 7670fc1b3f45da25e470a394748d851673c5427f | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Fri Mar 09 05:12:28 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 05:12:28 2018 +0000 |
| tree | b08ab53d62dcb83b79f10680427b92b0d11c626a | |
| parent | 9054d47db3da139869264036544718fd8447bcaa [diff] | |
| parent | 0d3062d6e86e98f9627d2e6275b26a82488740dd [diff] |
Merge "codec2: fix C2Buffer" into pi-dev am: 0d3062d6e8 Change-Id: I369b5b3b8380bc2bf08197256df4a99e21c49d40
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;