diff options
| author | James Dong <jdong@google.com> | 2011-12-06 12:52:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-06 12:52:52 -0800 |
| commit | e74de52d4e22fc61d41f703672fa8f1215446ab5 (patch) | |
| tree | ebca213f22bc3adee2b0c9efd3fb0aedef86918b /media/libstagefright | |
| parent | f7b5cdd410cb8fdd46bac5b5098e0f01442bba12 (diff) | |
| parent | 223e70d6bde101349cba04b20ef243730cf84c07 (diff) | |
| download | frameworks_av-e74de52d4e22fc61d41f703672fa8f1215446ab5.zip frameworks_av-e74de52d4e22fc61d41f703672fa8f1215446ab5.tar.gz frameworks_av-e74de52d4e22fc61d41f703672fa8f1215446ab5.tar.bz2 | |
Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/SampleTable.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp index 69d1785..bf31947 100644 --- a/media/libstagefright/SampleTable.cpp +++ b/media/libstagefright/SampleTable.cpp @@ -627,6 +627,14 @@ status_t SampleTable::findSyncSampleNear( ++left; } + + if (left == mNumSyncSamples) { + if (flags == kFlagAfter) { + LOGE("tried to find a sync frame after the last one: %d", left); + return ERROR_OUT_OF_RANGE; + } + } + if (left > 0) { --left; } |