commit 727f9e1e8e1306af761765e480ac5499224db646
author James Dong <jdong@google.com> Fri Jan 20 13:09:13 2012 -0800
committer James Dong <jdong@google.com> Fri Jan 20 18:52:27 2012 -0800
tree 8d743d4a1d1c29bf3f3eebb41072bba0419e6b0b
parent 6f9028e5fd2f4dae3068c07bcb5221c5e7c515fa

AudioPlayerBase and VideoEditorAudioPlayer class design is incorrect.

o this patch removed the AudioPlayerBase class.
o verified and passed functional tests

Change-Id: I33727069ef63136979b954a9dee1c35309ef6dd4

libvideoeditor/lvpp/PreviewPlayer.h

diff --git a/libvideoeditor/lvpp/PreviewPlayer.h b/libvideoeditor/lvpp/PreviewPlayer.h
index 45f3fc2..177853f 100755
--- a/libvideoeditor/lvpp/PreviewPlayer.h
+++ b/libvideoeditor/lvpp/PreviewPlayer.h
@@ -30,7 +30,6 @@
 namespace android {
 
 struct VideoEditorAudioPlayer;
-struct AudioPlayerBase;
 struct MediaExtractor;
 
 struct PreviewPlayer {
@@ -89,7 +88,7 @@
     status_t setImageClipProperties(uint32_t width, uint32_t height);
     status_t readFirstVideoFrame();
     status_t getLastRenderedTimeMs(uint32_t *lastRenderedTimeMs);
-    status_t setAudioPlayer(AudioPlayerBase *audioPlayer);
+    status_t setAudioPlayer(VideoEditorAudioPlayer *audioPlayer);
 
 private:
     enum {
@@ -143,7 +142,7 @@
 
     sp<MediaSource> mAudioTrack;
     sp<MediaSource> mAudioSource;
-    AudioPlayerBase *mAudioPlayer;
+    VideoEditorAudioPlayer *mAudioPlayer;
     int64_t mDurationUs;
 
     int32_t mDisplayWidth;
@@ -235,7 +234,6 @@
 
     M4VIFI_UInt8*  mFrameRGBBuffer;
     M4VIFI_UInt8*  mFrameYUVBuffer;
-    VideoEditorAudioPlayer  *mVeAudioPlayer;
 
     void cancelPlayerEvents_l(bool updateProgressCb = false);
     status_t setDataSource_l(const sp<MediaExtractor> &extractor);