| commit | cac76070ee7311d8aa1f931f75fc0d4881a56d68 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Fri Mar 09 05:13:20 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 05:13:20 2018 +0000 |
| tree | c90a47be25b6a47c95a5c6bf3b58b6c02c78af1d | |
| parent | 7670fc1b3f45da25e470a394748d851673c5427f [diff] | |
| parent | a1bc17b32c37af2ff96361af5e14121c1aba56b2 [diff] |
Merge "C2SoftAvc: fix flush and map error" into pi-dev am: a1bc17b32c Change-Id: Ief18daad08b58107a609152aa6614f0f1b26724d
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;