| commit | 25419d27c07db5d18450d25171cef396ac2a9db7 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Fri Mar 09 05:14:31 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 05:14:31 2018 +0000 |
| tree | deae4cc40ff5c224ae94f942290debebabd8f226 | |
| parent | 765c492f0d488ccb97046d1e99e67890b0196b83 [diff] | |
| parent | 829d4349a99c3c7fb20cb43714a77450b7e16a47 [diff] |
Merge "C2SoftAac: fix error handling" into pi-dev am: 829d4349a9 Change-Id: Ib0f83179fa2f2bc81d9ee76cfba485297c7d31e8
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;