commit 0b6e47ad74f5e1671d54c8411d487b30780e2e2c
author Wei Jia <wjia@google.com> Sat Jan 30 00:43:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 30 00:43:35 2016 +0000
tree ece517ab78556659d51499c5842d21d393e1ece7
parent 7ee3db58449dde22652be3c056f488b24b5fb14d
parent c673de8067ad53f96b3fcd2b7b24b066303a32aa

Merge "ACodec: free buffers when allocateBuffers failed."

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index fa6242e..82ac72c 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -5906,6 +5906,15 @@
 
         mCodec->signalError(OMX_ErrorUndefined, makeNoSideEffectStatus(err));
 
+        mCodec->mOMX->sendCommand(
+                mCodec->mNode, OMX_CommandStateSet, OMX_StateLoaded);
+        if (mCodec->allYourBuffersAreBelongToUs(kPortIndexInput)) {
+            mCodec->freeBuffersOnPort(kPortIndexInput);
+        }
+        if (mCodec->allYourBuffersAreBelongToUs(kPortIndexOutput)) {
+            mCodec->freeBuffersOnPort(kPortIndexOutput);
+        }
+
         mCodec->changeState(mCodec->mLoadedState);
     }
 }