commit 0dca30c6850e906ec0b68faab96979a3cbec1610
author TreeHugger Robot <treehugger-gerrit@google.com> Sat May 02 03:09:09 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 02 03:09:09 2020 +0000
tree f1a05e8f3a1939b95f45e5702cf7a85f0e42ee0b
parent ab878811b173309ee2311317c26150da9becb37a
parent 987087c303dc9cd0c0557cd856d369192f57fa44

Merge "Release buffers on MediaCodec#stop()" into rvc-dev am: 987087c303

Change-Id: Ie4c621e4a476fa4995eea5e62157ee7b2c266263

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 01d106f..1e4560c 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -1406,6 +1406,9 @@
         // TODO: convert err into status_t
         mCallback->onError(UNKNOWN_ERROR, ACTION_CODE_FATAL);
     }
+    // Assure buffers are not owned when stop() was called without flush().
+    std::list<std::unique_ptr<C2Work>> flushedWork;
+    mChannel->flush(flushedWork);
 
     {
         Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);