commit b4115796677af33b5271d518b3e2d736b1ce7973
author Marco Nelissen <marcone@google.com> Wed Mar 14 16:40:11 2012 -0700
committer Marco Nelissen <marcone@google.com> Wed Mar 14 16:42:09 2012 -0700
tree ae142060703904f5b89e94314ec4fcbd98ae3041
parent 467ec7eda8ad754d6a92d32040738b797ba5e994

Fix Xing seeking when TOC[0] == 0

A file purchased from the Amazon mp3 store had two 0 entries at the
start of the TOC (presumably because there was a lot of silence at
the beginning, which compresses well), which made TOC based seeking
think the TOC was not valid.
b/6170518

Change-Id: Ie7135b4af06ebb925f63a374be780cf3a9404347

media/libstagefright/XINGSeeker.cpp

diff --git a/media/libstagefright/XINGSeeker.cpp b/media/libstagefright/XINGSeeker.cpp
index 2091381..e36d619 100644
--- a/media/libstagefright/XINGSeeker.cpp
+++ b/media/libstagefright/XINGSeeker.cpp
@@ -24,7 +24,7 @@
 static bool parse_xing_header(
         const sp<DataSource> &source, off64_t first_frame_pos,
         int32_t *frame_number = NULL, int32_t *byte_number = NULL,
-        unsigned char *table_of_contents = NULL,
+        unsigned char *table_of_contents = NULL, bool *toc_is_valid = NULL,
         int32_t *quality_indicator = NULL, int64_t *duration = NULL);
 
 // static
@@ -36,7 +36,7 @@
 
     if (!parse_xing_header(
                 source, first_frame_pos,
-                NULL, &seeker->mSizeBytes, seeker->mTableOfContents,
+                NULL, &seeker->mSizeBytes, seeker->mTOC, &seeker->mTOCValid,
                 NULL, &seeker->mDurationUs)) {
         return NULL;
     }
@@ -60,7 +60,7 @@
 }
 
 bool XINGSeeker::getOffsetForTime(int64_t *timeUs, off64_t *pos) {
-    if (mSizeBytes == 0 || mTableOfContents[0] <= 0 || mDurationUs < 0) {
+    if (mSizeBytes == 0 || !mTOCValid || mDurationUs < 0) {
         return false;
     }
 
@@ -76,10 +76,10 @@
         if ( a == 0 ) {
             fa = 0.0f;
         } else {
-            fa = (float)mTableOfContents[a-1];
+            fa = (float)mTOC[a-1];
         }
         if ( a < 99 ) {
-            fb = (float)mTableOfContents[a];
+            fb = (float)mTOC[a];
         } else {
             fb = 256.0f;
         }
@@ -94,7 +94,8 @@
 static bool parse_xing_header(
         const sp<DataSource> &source, off64_t first_frame_pos,
         int32_t *frame_number, int32_t *byte_number,
-        unsigned char *table_of_contents, int32_t *quality_indicator,
+        unsigned char *table_of_contents, bool *toc_valid,
+        int32_t *quality_indicator,
         int64_t *duration) {
     if (frame_number) {
         *frame_number = 0;
@@ -102,8 +103,8 @@
     if (byte_number) {
         *byte_number = 0;
     }
-    if (table_of_contents) {
-        table_of_contents[0] = 0;
+    if (toc_valid) {
+        *toc_valid = false;
     }
     if (quality_indicator) {
         *quality_indicator = 0;
@@ -199,10 +200,13 @@
         offset += 4;
     }
     if (flags & 0x0004) {  // TOC field is present
-       if (table_of_contents) {
+        if (table_of_contents) {
             if (source->readAt(offset + 1, table_of_contents, 99) < 99) {
                 return false;
             }
+            if (toc_valid) {
+                *toc_valid = true;
+            }
         }
         offset += 100;
     }

media/libstagefright/include/XINGSeeker.h

diff --git a/media/libstagefright/include/XINGSeeker.h b/media/libstagefright/include/XINGSeeker.h
index ec5bd9b..8510979 100644
--- a/media/libstagefright/include/XINGSeeker.h
+++ b/media/libstagefright/include/XINGSeeker.h
@@ -37,7 +37,8 @@
     int32_t mSizeBytes;
 
     // TOC entries in XING header. Skip the first one since it's always 0.
-    unsigned char mTableOfContents[99];
+    unsigned char mTOC[99];
+    bool mTOCValid;
 
     XINGSeeker();