| commit | 24053f89d646f57ada58cd1df55bbf5c7bc8d209 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Fri Mar 09 05:10:45 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 05:10:45 2018 +0000 |
| tree | 46ba057969e45eb34cb15f06d41327e375ece28d | |
| parent | f4f08c3307becefd226ef09c383b357ba1f5efad [diff] | |
| parent | 6378937c0d8215f2248217aa8f26d84f72a638ee [diff] |
codec2: fix SimpleC2Component race condition am: 6378937c0d Change-Id: I9a8d66833a5633406fea2121de68bff6a8333b7b
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;