| commit | 82cb765c2a48d1a6787c2c2dac924dc6addf670f | [log] [tgz] |
|---|---|---|
| author | Insun Kang <insun@google.com> | Thu Mar 08 01:54:34 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 08 01:54:34 2018 +0000 |
| tree | 9abe630a6ae909552b3fd480c1b93bc946ce5782 | |
| parent | 27b3ce4922f55fcc79a56f8f9890a67957aafc12 [diff] | |
| parent | fa97d22b9463a9ad4c2d4e16b6644ab97da150d4 [diff] |
Merge "VideoView2: Initial integrated version with MediaPlayer2" into pi-dev am: fa97d22b94 Change-Id: I771d87da4197b11636c4352ded3c74f00f29d9b4
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;