diff options
author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 14:24:46 -0700 |
---|---|---|
committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 14:24:46 -0700 |
commit | d9a8909b45b516f54460c2bb13af31a9639fe703 (patch) | |
tree | 9fa13ec5ed0a2fc8f5ed4fd89dd29c0cb445cd42 /media/libstagefright/include | |
parent | bdb54da9baf8349a1f030064c3af4ff7318f4771 (diff) | |
parent | 6679b5088f36693f5708dcaedd0c9ab7c66df27c (diff) | |
download | frameworks_av-d9a8909b45b516f54460c2bb13af31a9639fe703.zip frameworks_av-d9a8909b45b516f54460c2bb13af31a9639fe703.tar.gz frameworks_av-d9a8909b45b516f54460c2bb13af31a9639fe703.tar.bz2 |
Merge tag 'android-6.0.1_r66' into HEAD
Android 6.0.1 release 66
Change-Id: I1d3eb6b66b7482149fe93647c278065fa46dc518
Diffstat (limited to 'media/libstagefright/include')
-rw-r--r-- | media/libstagefright/include/SampleTable.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/libstagefright/include/SampleTable.h b/media/libstagefright/include/SampleTable.h index 465f37c..552eef7 100644 --- a/media/libstagefright/include/SampleTable.h +++ b/media/libstagefright/include/SampleTable.h @@ -24,7 +24,6 @@ #include <media/stagefright/MediaErrors.h> #include <utils/RefBase.h> #include <utils/threads.h> -#include <utils/Vector.h> namespace android { @@ -96,6 +95,9 @@ private: static const uint32_t kSampleSizeType32; static const uint32_t kSampleSizeTypeCompact; + // Limit the total size of all internal tables to 200MiB. + static const size_t kMaxTotalSize = 200 * (1 << 20); + sp<DataSource> mDataSource; Mutex mLock; @@ -113,7 +115,7 @@ private: bool mHasTimeToSample; uint32_t mTimeToSampleCount; - Vector<uint32_t> mTimeToSample; + uint32_t* mTimeToSample; struct SampleTimeEntry { uint32_t mSampleIndex; @@ -139,6 +141,9 @@ private: }; SampleToChunkEntry *mSampleToChunkEntries; + // Approximate size of all tables combined. + uint64_t mTotalSize; + friend struct SampleIterator; // normally we don't round |