commit e6815bf8b4eaf9cc861e389cbebe3d7412698e9f
author James Dong <jdong@google.com> Mon May 02 18:23:42 2011 -0700
committer James Dong <jdong@google.com> Tue May 03 11:07:09 2011 -0700
tree 2149dff4d1337a356e77397e4a7539c6c6ef25de
parent 2dbef65fea1115c53edda5bd4b40c4f49c0d06dd

Clean up VideoEditorSRC

o removed unused member variables
o removed pre-processor for FROYO, since we only made video editor available after HC.
o cleaned up the header includes

Change-Id: I101775cc384310d661a65485113ac1bc1f6cdf17

libvideoeditor/lvpp/VideoEditorSRC.h

diff --git a/libvideoeditor/lvpp/VideoEditorSRC.h b/libvideoeditor/lvpp/VideoEditorSRC.h
index 50da23f..8bfd991 100755
--- a/libvideoeditor/lvpp/VideoEditorSRC.h
+++ b/libvideoeditor/lvpp/VideoEditorSRC.h
@@ -18,19 +18,16 @@
 #include <stdint.h>

 

 #include <utils/RefBase.h>

-#include <media/stagefright/MediaErrors.h>

+#include <utils/threads.h>

 

 #include <media/stagefright/MediaSource.h>

-#include <media/stagefright/MediaBuffer.h>

-#include <media/stagefright/MediaBufferGroup.h>

-#include <media/stagefright/MediaDefs.h>

 

 #include "AudioBufferProvider.h"

 #include "AudioResampler.h"

 

 namespace android {

-//struct MediaSource;

 

+struct MediaBuffer;

 

 class VideoEditorSRC : public MediaSource , public AudioBufferProvider {

 

@@ -51,14 +48,14 @@
 

     enum { //Sampling freq

         kFreq8000Hz = 8000,

-     kFreq11025Hz = 11025,

-     kFreq12000Hz = 12000,

-     kFreq16000Hz = 16000,

-     kFreq22050Hz = 22050,

-     kFreq240000Hz = 24000,

-     kFreq32000Hz = 32000,

-     kFreq44100 = 44100,

-     kFreq48000 = 48000,

+        kFreq11025Hz = 11025,

+        kFreq12000Hz = 12000,

+        kFreq16000Hz = 16000,

+        kFreq22050Hz = 22050,

+        kFreq240000Hz = 24000,

+        kFreq32000Hz = 32000,

+        kFreq44100 = 44100,

+        kFreq48000 = 48000,

     };

 

     static const uint16_t UNITY_GAIN = 0x1000;

@@ -72,13 +69,8 @@
         VideoEditorSRC &operator=(const VideoEditorSRC &);

 

         AudioResampler        *mResampler;

-        AudioBufferProvider  *mbufferProvider;

         sp<MediaSource>      mSource;

         MediaBuffer      *mCopyBuffer;

-        MediaBufferGroup *mGroup;

-        uint8_t *mInputByteBuffer;

-        int32_t mInputBufferLength;

-        int mInputFrameSize;

         int mBitDepth;

         int mChannelCnt;

         int mSampleRate;

@@ -88,9 +80,8 @@
         bool mIsChannelConvertionRequired; // for mono to stereo

         sp<MetaData> mOutputFormat;

         Mutex mLock;

-        int32_t *pTmpBuffer;

 

-        uint8_t* pInterframeBuffer;

+        uint8_t* mInterframeBuffer;

         int32_t mInterframeBufferPosition;

         int32_t mLeftover;

         int32_t mLastReadSize ;