commit e467567fba48c7b2c91b7e35e2f4668e8d0b1574
author Sungtak Lee <taklee@google.com> Mon Apr 18 04:39:51 2022 -0700
committer Sungtak Lee <taklee@google.com> Wed Apr 27 11:44:58 2022 -0700
tree 7a040cc1eed49d07c9cf2f077d453cdad0a0dd68
parent c1e2647495d6b3806afa3f83d8eadcb5b4b77d20

C2BqBuffer: Remove detach during migration

Remove detach for efficient surface switching.
1. Since GraphicBuffer handle is cloned, removing detach() from
   migration is fine.
2. Since we will not use dequeued GraphicBuffer after BlockPool dtor(),
   removing detatch() from dtor is also fine.

Bug: 185451746
Test: atest android.media.decoder.cts.AdaptivePlaybackTest
Test: manually crafted test
Merged-In: I46cf14e7e71e35a5982d8073707bbbf558be9be6
Change-Id: I46cf14e7e71e35a5982d8073707bbbf558be9be6

media/codec2/vndk/platform/C2BqBuffer.cpp

diff --git a/media/codec2/vndk/platform/C2BqBuffer.cpp b/media/codec2/vndk/platform/C2BqBuffer.cpp
index 2cca3c8..63b0f39 100644
--- a/media/codec2/vndk/platform/C2BqBuffer.cpp
+++ b/media/codec2/vndk/platform/C2BqBuffer.cpp
@@ -576,14 +576,7 @@
     }
 
     ~Impl() {
-        bool noInit = false;
         for (int i = 0; i < NUM_BUFFER_SLOTS; ++i) {
-            if (!noInit && mProducer) {
-                Return<HStatus> transResult =
-                        mProducer->detachBuffer(static_cast<int32_t>(i));
-                noInit = !transResult.isOk() ||
-                         static_cast<HStatus>(transResult) == HStatus::NO_INIT;
-            }
             mBuffers[i].clear();
         }
     }
@@ -692,15 +685,6 @@
         {
             sp<GraphicBuffer> buffers[NUM_BUFFER_SLOTS];
             std::scoped_lock<std::mutex> lock(mMutex);
-            bool noInit = false;
-            for (int i = 0; i < NUM_BUFFER_SLOTS; ++i) {
-                if (!noInit && mProducer) {
-                    Return<HStatus> transResult =
-                            mProducer->detachBuffer(static_cast<int32_t>(i));
-                    noInit = !transResult.isOk() ||
-                             static_cast<HStatus>(transResult) == HStatus::NO_INIT;
-                }
-            }
             int32_t oldGeneration = mGeneration;
             if (producer) {
                 mProducer = producer;