| commit | d3a6c2c4939caff02ea7befd40a42163503b3c2c | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Fri Mar 09 20:07:08 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 20:07:08 2018 +0000 |
| tree | 57b6f4f5ef2779320874eb586e0659a00cdc54e4 | |
| parent | e64d563760f14358bbd708eae76f803934f3d939 [diff] | |
| parent | ae9e2acb4847594ef9747264f5d092d8fa251119 [diff] |
CCodec: fix corner cases am: ae9e2acb48 Change-Id: I14c7fb62fbde05c7ffffa3eaf2650ce3be146ee0
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;