commit fa31daff175709d2c58d61d1354daa9495696631
author Raghavender Palla <rpalla@google.com> Fri Mar 18 22:32:51 2011 -0700
committer Raghavender Palla <rpalla@google.com> Mon Mar 21 21:59:15 2011 -0700
tree e1154f7b3d9a1af38571eb655f5373dd2de4329d
parent ebf40154a222c864a0aaf807702fc4eb6b9cf40f

Fix for the issue: TestPreviewWithTransition fails (4133108)

Change-Id: I53eb798f4f86e83f8a4668c7256241367c1ccbe4

libvideoeditor/lvpp/PreviewPlayer.cpp

diff --git a/libvideoeditor/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp
index babe957..8618221 100755
--- a/libvideoeditor/lvpp/PreviewPlayer.cpp
+++ b/libvideoeditor/lvpp/PreviewPlayer.cpp
@@ -594,9 +594,15 @@
         LOGV("MEDIA_PLAYBACK_COMPLETE");
         //pause before sending event
         pause_l(true /* at eos */);
+
+        //This lock is used to syncronize onStreamDone() in PreviewPlayer and
+        //stopPreview() in PreviewController
+        Mutex::Autolock autoLock(mLockControl);
         notifyListener_l(MEDIA_PLAYBACK_COMPLETE);
 
         mFlags |= AT_EOS;
+        LOGV("onStreamDone end");
+        return;
     }
 }
 
@@ -1490,6 +1496,16 @@
     return OK;
 }
 
+void PreviewPlayer::acquireLock() {
+    LOGV("acquireLock");
+    mLockControl.lock();
+}
+
+void PreviewPlayer::releaseLock() {
+    LOGV("releaseLock");
+    mLockControl.unlock();
+}
+
 status_t PreviewPlayer::resume() {
     LOGV("resume");
     Mutex::Autolock autoLock(mLock);