| commit | aa93c2e1ed709351dc762806f318f7995929d734 | [log] [tgz] |
|---|---|---|
| author | Sungsoo Lim <sungsoo@google.com> | Thu Mar 08 10:50:44 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 08 10:50:44 2018 +0000 |
| tree | c27ee02775f905e7d14f3c31368698798377dcf4 | |
| parent | b528587073f7ebe2f5f981490ea2bafc4819fcfe [diff] | |
| parent | 99495369d669f72db25646dfe3f2e1b8b7718e6b [diff] |
Merge "VideoView2Impl: Implement RoutePlayer" into pi-dev am: 99495369d6 Change-Id: I3412dce0a24cce882f5033dc325440f2c5c8209b
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;