commit c0fb0446de0a4fbd80a23531163fad5ddb56934c
author Sungtak Lee <taklee@google.com> Mon Sep 19 22:33:00 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 19 22:33:00 2022 +0000
tree cebb8d6987126c10aba20b883249b2565e5611ca
parent 90f6900f3d07662a6612f190f83319ce2b4a2984
parent 58c3812982332bd922e0f4eaacd5e9ce02d8989a

CCodec: Delay stop using surface until the end of release() am: 58c3812982

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19980354

Change-Id: I05fbde29042e2cd0a2f27e3127a22b9bf503c406
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 124a893..72301db 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -1973,7 +1973,6 @@
     }
 
     mChannel->reset();
-    mChannel->stopUseOutputSurface();
     // thiz holds strong ref to this while the thread is running.
     sp<CCodec> thiz(this);
     std::thread([thiz, sendCallback] { thiz->release(sendCallback); }).detach();
@@ -1994,6 +1993,7 @@
         comp = state->comp;
     }
     comp->release();
+    mChannel->stopUseOutputSurface();
 
     {
         Mutexed<State>::Locked state(mState);