commit 28301383d38d81b44d6a9b6b1f5822e90e440625
author Marco Nelissen <marcone@google.com> Tue Jul 17 16:03:09 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 17 16:03:09 2018 -0700
tree 2de97d810aef8b4b041e79cf0591717a4a298cd3
parent 20bed7f2c917502486723c6c597167743f5f9683
parent cd17b7453da3323634662e7ddb9712e5e0ae00c5

Merge "Improve seeking for Xing header without TOC"
am: cd17b7453d

Change-Id: I7b779ab06770e8c15e143a3f33ecbab38ed03b04

media/extractors/mp3/XINGSeeker.cpp

diff --git a/media/extractors/mp3/XINGSeeker.cpp b/media/extractors/mp3/XINGSeeker.cpp
index 95ca556..01e06ca 100644
--- a/media/extractors/mp3/XINGSeeker.cpp
+++ b/media/extractors/mp3/XINGSeeker.cpp
@@ -44,7 +44,7 @@
 }
 
 bool XINGSeeker::getOffsetForTime(int64_t *timeUs, off64_t *pos) {
-    if (mSizeBytes == 0 || !mTOCValid || mDurationUs < 0) {
+    if (mSizeBytes == 0 || mDurationUs < 0) {
         return false;
     }
 
@@ -54,7 +54,7 @@
         fx = 0.0f;
     } else if( percent >= 100.0f ) {
         fx = 256.0f;
-    } else {
+    } else if (mTOCValid) {
         int a = (int)percent;
         float fa, fb;
         if ( a == 0 ) {
@@ -68,6 +68,8 @@
             fb = 256.0f;
         }
         fx = fa + (fb-fa)*(percent-a);
+    } else {
+        fx = percent * 2.56f;
     }
 
     *pos = (int)((1.0f/256.0f)*fx*mSizeBytes) + mFirstFramePos;