Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1

2011-12-06 12:52:52 -08:00
parent 05d6306911 cb064917cf
commit 6b8b5a0a41
1 changed files with 8 additions and 0 deletions
--- 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;
    }