commit c3fbb284393a7cb7acd0e4cef538d60cf80de18c
author David Stevens <stevensd@google.com> Mon Jan 18 18:11:20 2021 +0900
committer David Stevens <stevensd@google.com> Wed Jan 27 05:01:35 2021 +0000
tree b93fd26c2fd1e550af6f70182cc7417a946a3bec
parent 82aff67588f6c1fc701f8bd36d8e3c57d21886d3

codec2: clean up old block pools

CCodecBufferChannel may create many block pools from a single component,
but only the most recently created block pool is actually used. When
creating a new pool, if there was a previous block pool, make sure it
gets cleaned up, so that the component doesn't end up accumulating block
pools until it is reset or released.

Bug: 176949973
Test: DecodeAccuracyTest + AdaptivePlaybackTest

Change-Id: I0d31c81692687f04bdd9617d508d57448dff1d8d
(cherry picked from commit c162e2b5c76ac465e927c582bc3efe6177841c36)

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index c697b80..96af7cb 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -159,6 +159,10 @@
         output->outputDelay = 0u;
         output->numSlots = kSmoothnessFactor;
     }
+    {
+        Mutexed<BlockPools>::Locked pools(mBlockPools);
+        pools->outputPoolId = C2BlockPool::BASIC_LINEAR;
+    }
 }
 
 CCodecBufferChannel::~CCodecBufferChannel() {
@@ -1092,10 +1096,13 @@
 
         bool graphic = (oStreamFormat.value == C2BufferData::GRAPHIC);
         C2BlockPool::local_id_t outputPoolId_;
+        C2BlockPool::local_id_t prevOutputPoolId;
 
         {
             Mutexed<BlockPools>::Locked pools(mBlockPools);
 
+            prevOutputPoolId = pools->outputPoolId;
+
             // set default allocator ID.
             pools->outputAllocatorId = (graphic) ? C2PlatformAllocatorStore::GRALLOC
                                                  : preferredLinearId;
@@ -1189,6 +1196,15 @@
             outputPoolId_ = pools->outputPoolId;
         }
 
+        if (prevOutputPoolId != C2BlockPool::BASIC_LINEAR
+                && prevOutputPoolId != C2BlockPool::BASIC_GRAPHIC) {
+            c2_status_t err = mComponent->destroyBlockPool(prevOutputPoolId);
+            if (err != C2_OK) {
+                ALOGW("Failed to clean up previous block pool %llu - %s (%d)\n",
+                        (unsigned long long) prevOutputPoolId, asString(err), err);
+            }
+        }
+
         Mutexed<Output>::Locked output(mOutput);
         output->outputDelay = outputDelayValue;
         output->numSlots = numOutputSlots;