| commit | 6b26aa47a1afa3cd8526475650812afd04fa1779 | [log] [tgz] |
|---|---|---|
| author | Sungsoo Lim <sungsoo@google.com> | Fri Mar 09 14:21:20 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 14:21:20 2018 +0000 |
| tree | 7a68d806e1d2ed35405d6a9a6c6469c42646a8f7 | |
| parent | 44ac86cc45bb2dd025305a29fc934fc032d5875e [diff] | |
| parent | c940e6e76d82e4a0090e92d8f03214a633983dbe [diff] |
Merge "Implement methods of MediaPlaylistAgentImpl" into pi-dev am: c940e6e76d Change-Id: I3e7302f7368cb4fc20bdeb48f1bc846de704abaf
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;