commit f9b32129d4f40c62b664427df073c4e73bf66399
author Wonsik Kim <wonsik@google.com> Thu Apr 02 11:30:17 2020 -0700
committer Wonsik Kim <wonsik@google.com> Thu Apr 02 11:30:17 2020 -0700
tree 630d7dcee05cfa742f6f272f3750e4271a499b8e
parent 0e89f31da8bb558c26c6f5c79b297a87ff90e7a3

codec2: change of asC2Buffer behavior

Bug: 152617675
Test: atest CtsMediaTestCases:MediaCodecBlockModelTest
Change-Id: Ie5893313840c6f1c349affca15f105520d7965cb

media/codec2/sfplugin/CCodecBuffers.cpp

diff --git a/media/codec2/sfplugin/CCodecBuffers.cpp b/media/codec2/sfplugin/CCodecBuffers.cpp
index 668f892..d7cc175 100644
--- a/media/codec2/sfplugin/CCodecBuffers.cpp
+++ b/media/codec2/sfplugin/CCodecBuffers.cpp
@@ -261,6 +261,7 @@
     std::shared_ptr<C2Buffer> result = mBuffers[index].compBuffer.lock();
     if (!result) {
         result = clientBuffer->asC2Buffer();
+        clientBuffer->clearC2BufferRefs();
         mBuffers[index].compBuffer = result;
     }
     if (c2buffer) {
@@ -379,6 +380,7 @@
     std::shared_ptr<C2Buffer> result = mBuffers[index].compBuffer.lock();
     if (!result) {
         result = clientBuffer->asC2Buffer();
+        clientBuffer->clearC2BufferRefs();
         mBuffers[index].compBuffer = result;
     }
     if (c2buffer) {