diff options
| author | Hong Teng <hongteng@google.com> | 2011-12-16 15:17:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-16 15:17:46 -0800 |
| commit | e78950e714e57767b54a836e22924212cfbf5f5f (patch) | |
| tree | ef7fa55057dfc3e28102fb2fe554b78d016d1f3d /media/libstagefright | |
| parent | f602a5f7f29e694a7da4c143737b74501c00477d (diff) | |
| parent | 8d0dd8b46163ec7b42e2051c441ae2bf96dd9aec (diff) | |
| download | frameworks_av-e78950e714e57767b54a836e22924212cfbf5f5f.zip frameworks_av-e78950e714e57767b54a836e22924212cfbf5f5f.tar.gz frameworks_av-e78950e714e57767b54a836e22924212cfbf5f5f.tar.bz2 | |
Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed."
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/SampleTable.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp index 8e790fc..3e287fa 100644 --- a/media/libstagefright/SampleTable.cpp +++ b/media/libstagefright/SampleTable.cpp @@ -632,6 +632,13 @@ status_t SampleTable::findSyncSampleNear( break; } } + if (left == mNumSyncSamples) { + if (flags == kFlagAfter) { + LOGE("tried to find a sync frame after the last one: %d", left); + return ERROR_OUT_OF_RANGE; + } + left = left - 1; + } // Now ssi[left] is the sync sample index just before (or at) // start_sample_index. |