commit c3e1e1e4207a655bf5a3ecf9b9e41700e54a3c86
author Danny Fernandes <dannyfernandes@google.com> Wed Feb 16 11:37:12 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 16 11:37:12 2011 -0800
tree f5a8756cc9dfad4e29ec2e606419661e0bf54a7f
parent a5a42c5ceb98942909d84b20d44a920eed85a8cf
parent f58e4c332ecf8c0cd6037b010256d0b4c56e6a17

Merge "Fixed issue 3443078 overlay flicker on transition in exported video"

libvideoeditor/lvpp/PreviewPlayer.cpp

diff --git a/libvideoeditor/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp
index d0b84d8..7d08a9f 100644
--- a/libvideoeditor/lvpp/PreviewPlayer.cpp
+++ b/libvideoeditor/lvpp/PreviewPlayer.cpp
@@ -27,7 +27,6 @@
 #include "DummyAudioSource.h"
 #include "DummyVideoSource.h"
 #include "VideoEditorSRC.h"
-#include "include/LiveSession.h"
 #include "include/NuCachedSource2.h"
 #include "include/ThrottledSource.h"
 
@@ -452,18 +451,6 @@
     }
 }
 
-void PreviewPlayer::partial_reset_l() {
-
-    if (mLastVideoBuffer) {
-        mLastVideoBuffer->release();
-        mLastVideoBuffer = NULL;
-    }
-
-    /* call base struct */
-    AwesomePlayer::partial_reset_l();
-
-}
-
 status_t PreviewPlayer::play() {
     Mutex::Autolock autoLock(mLock);
 

libvideoeditor/lvpp/PreviewPlayer.h

diff --git a/libvideoeditor/lvpp/PreviewPlayer.h b/libvideoeditor/lvpp/PreviewPlayer.h
index e06836e..dceffab 100644
--- a/libvideoeditor/lvpp/PreviewPlayer.h
+++ b/libvideoeditor/lvpp/PreviewPlayer.h
@@ -118,7 +118,6 @@
     status_t setDataSource_l(
         const char *uri, const KeyedVector<String8, String8> *headers);
     void reset_l();
-    void partial_reset_l();
     status_t play_l();
     status_t initRenderer_l();
     status_t initAudioDecoder();