commit e04ba51703c3fb797f6b7e22d5848d0ed3801bc6
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 12 00:53:54 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 12 00:53:54 2019 +0000
tree 9f9d6ae7ef665c54fb501aa85953e0821571a766
parent 717500c495d3e51189eed078ce23ae1dd3580ddd
parent aa50b1c12307591d6fb18f1d99de67e089aac27a

Merge "av: stop puller before releasing encoder"

media/libstagefright/MediaCodecSource.cpp

diff --git a/media/libstagefright/MediaCodecSource.cpp b/media/libstagefright/MediaCodecSource.cpp
index 0f75822..26797bb 100644
--- a/media/libstagefright/MediaCodecSource.cpp
+++ b/media/libstagefright/MediaCodecSource.cpp
@@ -643,6 +643,10 @@
             output->mBufferQueue.clear();
             output->mEncoderReachedEOS = true;
             output->mErrorCode = err;
+            if (!(mFlags & FLAG_USE_SURFACE_INPUT)) {
+                mStopping = true;
+                mPuller->stop();
+            }
             output->mCond.signal();
 
             reachedEOS = true;