diff options
author | Andreas Huber <andih@google.com> | 2011-02-16 09:06:50 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-02-16 09:06:50 -0800 |
commit | a5a42c5ceb98942909d84b20d44a920eed85a8cf (patch) | |
tree | 8ebb9435bd9380c2ddffd3f25cdbce4546c5ab00 /libvideoeditor | |
parent | c083500e41973256e0c3d4faf5948916b64e918e (diff) | |
download | frameworks_av-a5a42c5ceb98942909d84b20d44a920eed85a8cf.zip frameworks_av-a5a42c5ceb98942909d84b20d44a920eed85a8cf.tar.gz frameworks_av-a5a42c5ceb98942909d84b20d44a920eed85a8cf.tar.bz2 |
Update this copy of our internal sources to reflect changes to the original...
Change-Id: I6f66c1f4e73f0a83faf0fbcdea5073e6b9fef1de
Diffstat (limited to 'libvideoeditor')
-rw-r--r-- | libvideoeditor/lvpp/PreviewPlayer.cpp | 13 | ||||
-rw-r--r-- | libvideoeditor/lvpp/PreviewPlayer.h | 1 |
2 files changed, 0 insertions, 14 deletions
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::reset_l() { } } -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); 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 @@ private: 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(); |