diff options
author | Chih-Chung Chang <chihchung@google.com> | 2011-11-15 19:47:25 +0800 |
---|---|---|
committer | Chih-Chung Chang <chihchung@google.com> | 2011-11-15 19:47:53 +0800 |
commit | 2db767137112a619751b70b9947aaa064030a210 (patch) | |
tree | f2dd3c3d99a3e9fc87dc4bbdb57933829657d04c /libvideoeditor | |
parent | e20c2c1775349da6d4a5700f0c7faaa07d62f409 (diff) | |
download | frameworks_av-2db767137112a619751b70b9947aaa064030a210.zip frameworks_av-2db767137112a619751b70b9947aaa064030a210.tar.gz frameworks_av-2db767137112a619751b70b9947aaa064030a210.tar.bz2 |
Fix 5607624: Native crash in movie studio while previewing the movie
Change-Id: I6bc123a3da4fb071a65fe776bcba0268fa58bf29
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-x | libvideoeditor/lvpp/VideoEditorSRC.cpp | 11 | ||||
-rwxr-xr-x | libvideoeditor/lvpp/VideoEditorSRC.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libvideoeditor/lvpp/VideoEditorSRC.cpp b/libvideoeditor/lvpp/VideoEditorSRC.cpp index 1ea32ef..364343a 100755 --- a/libvideoeditor/lvpp/VideoEditorSRC.cpp +++ b/libvideoeditor/lvpp/VideoEditorSRC.cpp @@ -41,6 +41,7 @@ VideoEditorSRC::VideoEditorSRC(const sp<MediaSource> &source) { mBuffer = NULL; mLeftover = 0; mFormatChanged = false; + mStopPending = false; mSeekMode = ReadOptions::SEEK_PREVIOUS_SYNC; // Input Source validation @@ -127,6 +128,11 @@ status_t VideoEditorSRC::read( // Resample to target quality mResampler->resample(pTmpBuffer, outFrameCnt, this); + if (mStopPending) { + stop(); + mStopPending = false; + } + // Change resampler and retry if format change happened if (mFormatChanged) { mFormatChanged = false; @@ -220,7 +226,10 @@ status_t VideoEditorSRC::getNextBuffer(AudioBufferProvider::Buffer *pBuffer) { // EOS or some other error if (err != OK) { LOGV("EOS or some err: %d", err); - stop(); + // We cannot call stop() here because stop() will release the + // AudioResampler, and we are in a callback of the AudioResampler. + // So just remember the fact and let read() call stop(). + mStopPending = true; return err; } diff --git a/libvideoeditor/lvpp/VideoEditorSRC.h b/libvideoeditor/lvpp/VideoEditorSRC.h index a5e8e22..c61b7c1 100755 --- a/libvideoeditor/lvpp/VideoEditorSRC.h +++ b/libvideoeditor/lvpp/VideoEditorSRC.h @@ -78,6 +78,7 @@ class VideoEditorSRC : public MediaSource , public AudioBufferProvider { MediaBuffer* mBuffer; int32_t mLeftover; bool mFormatChanged; + bool mStopPending; int64_t mInitialTimeStampUs; int64_t mAccuOutBufferSize; |