Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't assert on malformed .mp4 content that contains fewer samples than"

Browse Source
This commit is contained in:
Andreas Huber
2011-06-21 12:13:41 -07:00
committed by Android (Google) Code Review
parent bbf7c449e1 727863d2de
commit 157c74e7ac
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/libstagefright/SampleTable.cpp
View File

@@ -416,12 +416,16 @@ void SampleTable::buildSampleEntriesTable() {
uint32_t delta = mTimeToSample[2 * i + 1];
for (uint32_t j = 0; j < n; ++j) {
CHECK(sampleIndex < mNumSampleSizes);
if (sampleIndex < mNumSampleSizes) {
// Technically this should always be the case if the file
// is well-formed, but you know... there's (gasp) malformed
// content out there.
mSampleTimeEntries[sampleIndex].mSampleIndex = sampleIndex;
mSampleTimeEntries[sampleIndex].mSampleIndex = sampleIndex;
mSampleTimeEntries[sampleIndex].mCompositionTime =
sampleTime + getCompositionTimeOffset(sampleIndex);
mSampleTimeEntries[sampleIndex].mCompositionTime =
sampleTime + getCompositionTimeOffset(sampleIndex);
}
++sampleIndex;
sampleTime += delta;