commit 3deeeeeb6c1dd050d1c35064d7f08bfd8b537cbd
author Andreas Huber <andih@google.com> Fri Feb 25 09:15:05 2011 -0800
committer The Android Automerger <android-build@android.com> Mon Feb 28 16:42:38 2011 -0800
tree 7f09403f4f6ac2f74d1d11063b1fb035a4af4f28
parent aa05e8c760d5c2b228cbc1a0aeacbf058ae40978

DO NOT MERGE: Hack this copy of our internal sources to match changes to support A/V sync.

Change-Id: Iae0c63e936b2042473def8839f663605e68b6066

libvideoeditor/lvpp/PreviewPlayer.cpp

diff --git a/libvideoeditor/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp
index ca025d0..360206e 100644
--- a/libvideoeditor/lvpp/PreviewPlayer.cpp
+++ b/libvideoeditor/lvpp/PreviewPlayer.cpp
@@ -430,7 +430,7 @@
     mTimeSourceDeltaUs = 0;
     mVideoTimeUs = 0;
 
-    mSeeking = false;
+    mSeeking = NO_SEEK;
     mSeekNotificationSent = false;
     mSeekTimeUs = 0;
 
@@ -739,7 +739,7 @@
     TimeSource *ts_st =  &mSystemTimeSource;
     int64_t timeStartUs = ts_st->getRealTimeUs();
 
-    if (mSeeking) {
+    if (mSeeking != NO_SEEK) {
         if (mLastVideoBuffer) {
             mLastVideoBuffer->release();
             mLastVideoBuffer = NULL;
@@ -765,7 +765,7 @@
 
     if (!mVideoBuffer) {
         MediaSource::ReadOptions options;
-        if (mSeeking) {
+        if (mSeeking != NO_SEEK) {
             LOGV("LV PLAYER seeking to %lld us (%.2f secs)", mSeekTimeUs,
                                                       mSeekTimeUs / 1E6);
 
@@ -797,7 +797,7 @@
                 }
                 // So video playback is complete, but we may still have
                 // a seek request pending that needs to be applied to the audio track
-                if (mSeeking) {
+                if (mSeeking != NO_SEEK) {
                     LOGV("video stream ended while seeking!");
                 }
                 finishSeekIfNecessary(-1);
@@ -858,7 +858,7 @@
         }
     }
 
-    bool wasSeeking = mSeeking;
+    SeekType wasSeeking = mSeeking;
     finishSeekIfNecessary(timeUs);
 
     TimeSource *ts = (mFlags & AUDIO_AT_EOS) ? &mSystemTimeSource : mTimeSource;
@@ -886,7 +886,7 @@
 
         int64_t latenessUs = nowUs - timeUs;
 
-        if (wasSeeking) {
+        if (wasSeeking != NO_SEEK) {
             // Let's display the first frame after seeking right away.
             latenessUs = 0;
         }
@@ -1751,7 +1751,7 @@
 
     if (!mVideoBuffer) {
         MediaSource::ReadOptions options;
-        if (mSeeking) {
+        if (mSeeking != NO_SEEK) {
             LOGV("LV PLAYER seeking to %lld us (%.2f secs)", mSeekTimeUs,
                     mSeekTimeUs / 1E6);