diff options
| author | Wei Jia <wjia@google.com> | 2015-08-28 10:35:35 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-05-27 11:30:16 -0700 |
| commit | f81038006b4c59a5a148dcad887371206033c28f (patch) | |
| tree | e27334106fce00eddb73daa302a4d8d40fd2bce6 /media/libstagefright/SampleIterator.cpp | |
| parent | 6fdee2a83432b3b150d6a34f231c4e2f7353c01e (diff) | |
| download | frameworks_av-f81038006b4c59a5a148dcad887371206033c28f.zip frameworks_av-f81038006b4c59a5a148dcad887371206033c28f.tar.gz frameworks_av-f81038006b4c59a5a148dcad887371206033c28f.tar.bz2 | |
MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
GenericSource: return error when no track exists.
SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor.
Bug: 21657957
Bug: 23705695
Bug: 22802344
Bug: 28799341
Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04
(cherry picked from commit 0386c91b8a910a134e5898ffa924c1b6c7560b13)
Diffstat (limited to 'media/libstagefright/SampleIterator.cpp')
| -rw-r--r-- | media/libstagefright/SampleIterator.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/SampleIterator.cpp b/media/libstagefright/SampleIterator.cpp index 2748349..c5f359e 100644 --- a/media/libstagefright/SampleIterator.cpp +++ b/media/libstagefright/SampleIterator.cpp @@ -84,6 +84,11 @@ status_t SampleIterator::seekTo(uint32_t sampleIndex) { CHECK(sampleIndex < mStopChunkSampleIndex); + if (mSamplesPerChunk == 0) { + ALOGE("b/22802344"); + return ERROR_MALFORMED; + } + uint32_t chunk = (sampleIndex - mFirstChunkSampleIndex) / mSamplesPerChunk + mFirstChunk; |