commit 22fc52f6f72f39e33c3970d0291de3569118aa5c
author Andreas Huber <andih@google.com> Wed Jan 05 16:24:27 2011 -0800
committer Andreas Huber <andih@google.com> Wed Jan 05 16:24:27 2011 -0800
tree 3f446d7a2aa1e0e701b0ce33a10175547eb29bdf
parent 43c3e6ce02215ca99d506458f596cb1211639f29

Some more fixes regarding HTTP live in NuPlayer.

Change-Id: I9e29615fa8ee6c7bd4189373a75c20caef3fd2b1

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index a607b31..e1b371e 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -394,7 +394,7 @@
             int64_t seekTimeUs;
             CHECK(msg->findInt64("seekTimeUs", &seekTimeUs));
 
-            LOGI("kWhatSeek seekTimeUs=%lld us (%.2f secs)",
+            LOGV("kWhatSeek seekTimeUs=%lld us (%.2f secs)",
                  seekTimeUs, seekTimeUs / 1E6);
 
             mSource->seekTo(seekTimeUs);
@@ -428,17 +428,11 @@
 
     mRenderer->signalTimeDiscontinuity();
 
-    bool scanSourcesAgain = false;
-
-    if (mFlushingAudio == SHUT_DOWN) {
-        scanSourcesAgain = true;
-    } else if (mAudioDecoder != NULL) {
+    if (mAudioDecoder != NULL) {
         mAudioDecoder->signalResume();
     }
 
-    if (mFlushingVideo == SHUT_DOWN) {
-        scanSourcesAgain = true;
-    } else if (mVideoDecoder != NULL) {
+    if (mVideoDecoder != NULL) {
         mVideoDecoder->signalResume();
     }
 
@@ -453,7 +447,7 @@
     } else if (mResetPostponed) {
         (new AMessage(kWhatReset, id()))->post();
         mResetPostponed = false;
-    } else if (scanSourcesAgain) {
+    } else if (mAudioDecoder == NULL || mVideoDecoder == NULL) {
         postScanSources();
     }
 }