| commit | bbc5810582cb5cf9b9e093f1e6920d94c72dcc32 | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Fri Mar 09 22:04:38 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 22:04:38 2018 +0000 |
| tree | efe7c4841cd81aeafdebbb61bb5e34a55686effe | |
| parent | b9108baa01d2bbae57a804e46eea734c4fc3256f [diff] | |
| parent | 08ce69c929657887519fe3300ae13a4a1afbad8e [diff] |
Merge "Handle overflow in android::HeifDataSource::readAt am: 237f9034c6" into pi-dev am: 08ce69c929 Change-Id: I631141345bd39046c44f54fe12d55342790eb7cb
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;