| commit | 9054d47db3da139869264036544718fd8447bcaa | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Fri Mar 09 05:11:25 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 05:11:25 2018 +0000 |
| tree | 431dd2b3a43f889396881dc82c4949c65ecbc70d | |
| parent | 24053f89d646f57ada58cd1df55bbf5c7bc8d209 [diff] | |
| parent | b6b349550ffb505fd466f0f5aea635a52a569e13 [diff] |
Merge "C2SoftAvcEnc: don't crash at unexpected input" into pi-dev am: b6b349550f Change-Id: I584459c25843b8824c8a86427137b49ba4c97f4a
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;