commit 8d0648eff7a9a7bc7cd6318ba5fc96c759bef978
author Andreas Huber <andih@google.com> Thu Apr 05 08:46:13 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 05 08:46:13 2012 -0700
tree 81571b2602f0550ea4a90d70435e18cefd8d0880
parent 5faee0829f673f6147636820eafae2c0fa238c77
parent f02a7f5c42db707d20e59ff28f32d1eaebcc5429

Merge "Trust the Cues element"

media/libstagefright/timedtext/TimedTextPlayer.cpp

diff --git a/media/libstagefright/timedtext/TimedTextPlayer.cpp b/media/libstagefright/timedtext/TimedTextPlayer.cpp
index 917c62a..dc5f6b8 100644
--- a/media/libstagefright/timedtext/TimedTextPlayer.cpp
+++ b/media/libstagefright/timedtext/TimedTextPlayer.cpp
@@ -75,6 +75,21 @@
             mSendSubtitleGeneration++;
             break;
         }
+        case kWhatRetryRead: {
+            int64_t seekTimeUs;
+            int seekMode;
+            if (msg->findInt64("seekTimeUs", &seekTimeUs) &&
+                msg->findInt32("seekMode", &seekMode)) {
+                MediaSource::ReadOptions options;
+                options.setSeekTo(
+                    seekTimeUs,
+                    static_cast<MediaSource::ReadOptions::SeekMode>(seekMode));
+                doRead(&options);
+            } else {
+                doRead();
+            }
+            break;
+        }
         case kWhatSeek: {
             int64_t seekTimeUs = 0;
             msg->findInt64("seekTimeUs", &seekTimeUs);
@@ -146,7 +161,15 @@
     status_t err = mSource->read(&startTimeUs, &endTimeUs,
                                  &(parcelEvent->parcel), options);
     if (err == WOULD_BLOCK) {
-        postTextEventDelayUs(NULL, kWaitTimeUsToRetryRead);
+        sp<AMessage> msg = new AMessage(kWhatRetryRead);
+        if (options != NULL) {
+            int64_t seekTimeUs;
+            MediaSource::ReadOptions::SeekMode seekMode;
+            CHECK(options->getSeekTo(&seekTimeUs, &seekMode));
+            msg->setInt64("seekTimeUs", seekTimeUs);
+            msg->setInt32("seekMode", seekMode);
+        }
+        msg->post(kWaitTimeUsToRetryRead);
         return;
     } else if (err != OK) {
         notifyError(err);

media/libstagefright/timedtext/TimedTextPlayer.h

diff --git a/media/libstagefright/timedtext/TimedTextPlayer.h b/media/libstagefright/timedtext/TimedTextPlayer.h
index 47aff03..b7e15f8 100644
--- a/media/libstagefright/timedtext/TimedTextPlayer.h
+++ b/media/libstagefright/timedtext/TimedTextPlayer.h
@@ -50,6 +50,7 @@
     enum {
         kWhatPause = 'paus',
         kWhatSeek = 'seek',
+        kWhatRetryRead = 'read',
         kWhatSendSubtitle = 'send',
         kWhatSetSource = 'ssrc',
     };