| commit | 765c492f0d488ccb97046d1e99e67890b0196b83 | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Fri Mar 09 05:13:55 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 05:13:55 2018 +0000 |
| tree | 98faf5b1aa7c8987c23e77a855cfbbeb1f354891 | |
| parent | cac76070ee7311d8aa1f931f75fc0d4881a56d68 [diff] | |
| parent | 4706f6af73e485e4fbcb5ff76509fbd517223ad9 [diff] |
Merge "Add AUDIO_FORMAT_AAC_XHE to type converter" into pi-dev am: 4706f6af73 Change-Id: I586efe7359d03211dd98652e293cbbf624649ec6
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;