commit 3d974e7763495d8fda6f264810619cb3bd265293
author Chih-Chung Chang <chihchung@google.com> Thu Aug 18 19:41:30 2011 +0800
committer Chih-Chung Chang <chihchung@google.com> Tue Aug 23 16:28:40 2011 +0800
tree 0992f6778a26e45862c8c7faea05dc93f59c8977
parent 0a25bd5bacf5408ca205b15e53cfb6dc2fc1d171

Fix 5123908: Native crash rewinding movie

Simplify the VideoEditorSRC code and fix some bugs.

Change-Id: I6bcf3a5cea21a2eec4b51f167560c4b0d3a04a29

libvideoeditor/lvpp/VideoEditorSRC.h

diff --git a/libvideoeditor/lvpp/VideoEditorSRC.h b/libvideoeditor/lvpp/VideoEditorSRC.h
index 20313e3..a5e8e22 100755
--- a/libvideoeditor/lvpp/VideoEditorSRC.h
+++ b/libvideoeditor/lvpp/VideoEditorSRC.h
@@ -43,8 +43,6 @@
         virtual status_t getNextBuffer(Buffer* buffer);
         virtual void releaseBuffer(Buffer* buffer);
 
-        void setResampling(int32_t sampleRate=kFreq32000Hz);
-
     enum { //Sampling freq
         kFreq8000Hz = 8000,
         kFreq11025Hz = 11025,
@@ -58,7 +56,7 @@
     };
 
     static const uint16_t UNITY_GAIN = 0x1000;
-    static const int32_t DEFAULT_SAMPLING_FREQ = (int32_t)kFreq32000Hz; // kFreq44100;
+    static const int32_t DEFAULT_SAMPLING_FREQ = (int32_t)kFreq32000Hz;
 
     protected :
         virtual ~VideoEditorSRC();
@@ -67,33 +65,25 @@
         VideoEditorSRC();
         VideoEditorSRC &operator=(const VideoEditorSRC &);
 
-        status_t checkAndSetResampler();
+        void checkAndSetResampler();
 
         AudioResampler        *mResampler;
         sp<MediaSource>      mSource;
-        MediaBuffer      *mCopyBuffer;
-        int mBitDepth;
         int mChannelCnt;
         int mSampleRate;
         int32_t mOutputSampleRate;
         bool mStarted;
-        bool mIsResamplingRequired;
-        bool mIsChannelConvertionRequired; // for mono to stereo
         sp<MetaData> mOutputFormat;
-        Mutex mLock;
 
-        uint8_t* mInterframeBuffer;
-        int32_t mInterframeBufferPosition;
+        MediaBuffer* mBuffer;
         int32_t mLeftover;
-        int32_t mLastReadSize ;
+        bool mFormatChanged;
 
         int64_t mInitialTimeStampUs;
         int64_t mAccuOutBufferSize;
 
         int64_t mSeekTimeUs;
         ReadOptions::SeekMode mSeekMode;
-        int16_t *mReSampledBuffer;
-
 };
 
 } //namespce android