commit 225d5b20409fd400bfa4ed5e9bc1d5babb498471
author Lajos Molnar <lajos@google.com> Mon Jul 21 13:47:21 2014 -0700
committer Lajos Molnar <lajos@google.com> Mon Jul 21 13:53:37 2014 -0700
tree cdb6c6af42de0f14c7312cd0951937de29d7a2b0
parent ac847e2ca8e0a81e013e1fb2fdf2cefe21db3b75

stagefright: handle seeking to before first cue-point.

Bug: 16446994
Change-Id: Id3f9d6780a7c4f62171cbfa8675a67334e8dfa10

media/libstagefright/OggExtractor.cpp

diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp
index 0838004..821bd81 100644
--- a/media/libstagefright/OggExtractor.cpp
+++ b/media/libstagefright/OggExtractor.cpp
@@ -320,22 +320,26 @@
     }
 
     size_t left = 0;
-    size_t right = mTableOfContents.size() - 1;
-    while (left <= right) {
-        size_t center = left + (right - left) / 2;
+    size_t right_plus_one = mTableOfContents.size();
+    while (left < right_plus_one) {
+        size_t center = left + (right_plus_one - left) / 2;
 
         const TOCEntry &entry = mTableOfContents.itemAt(center);
 
         if (timeUs < entry.mTimeUs) {
-            right = center - 1;
+            right_plus_one = center;
         } else if (timeUs > entry.mTimeUs) {
             left = center + 1;
         } else {
-            left = right = center;
+            left = center;
             break;
         }
     }
 
+    if (left == mTableOfContents.size()) {
+        --left;
+    }
+
     const TOCEntry &entry = mTableOfContents.itemAt(left);
 
     ALOGV("seeking to entry %zu / %zu at offset %lld",

media/libstagefright/SampleTable.cpp

diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index c7e24fc..bad43f2 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -525,14 +525,14 @@
     buildSampleEntriesTable();
 
     uint32_t left = 0;
-    uint32_t right = mNumSampleSizes - 1;
-    while (left <= right) {
-        uint32_t center = left + (right - left) / 2;
+    uint32_t right_plus_one = mNumSampleSizes;
+    while (left < right_plus_one) {
+        uint32_t center = left + (right_plus_one - left) / 2;
         uint64_t centerTime =
             getSampleTime(center, scale_num, scale_den);
 
         if (req_time < centerTime) {
-            right = center - 1;
+            right_plus_one = center;
         } else if (req_time > centerTime) {
             left = center + 1;
         } else {
@@ -607,13 +607,13 @@
     }
 
     uint32_t left = 0;
-    uint32_t right = mNumSyncSamples - 1;
-    while (left <= right) {
-        uint32_t center = left + (right - left) / 2;
+    uint32_t right_plus_one = mNumSyncSamples;
+    while (left < right_plus_one) {
+        uint32_t center = left + (right_plus_one - left) / 2;
         uint32_t x = mSyncSamples[center];
 
         if (start_sample_index < x) {
-            right = center - 1;
+            right_plus_one = center;
         } else if (start_sample_index > x) {
             left = center + 1;
         } else {