| commit | dc1f673e9a8b4156ca703f0c2131a10b4cc01e63 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 22 03:23:42 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 22 03:23:42 2024 +0000 |
| tree | 10f3729cc358a3f96d9084bb3b82fdef3836345f | |
| parent | 7b363e91058afa2418e8cef460086ae334cd9b58 [diff] | |
| parent | 7e0e4f15eaf3c5219166718d9a9818e96c852159 [diff] |
Merge "GraphicsTracker: ensure migrated buffers are overwritten" into main am: 7e0e4f15ea Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3236919 Change-Id: I17f49f59dcf047aedc6d891cc10bfd0e4c512f1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/hal/client/GraphicsTracker.cpp b/media/codec2/hal/client/GraphicsTracker.cpp index 8d9e76e..e1193cc 100644 --- a/media/codec2/hal/client/GraphicsTracker.cpp +++ b/media/codec2/hal/client/GraphicsTracker.cpp
@@ -900,7 +900,10 @@ cache->unblockSlot(buffer->mSlot); if (oldBuffer) { // migrated, register the new buffer to the cache. - cache->mBuffers.emplace(buffer->mSlot, buffer); + auto ret = cache->mBuffers.emplace(buffer->mSlot, buffer); + if (!ret.second) { + ret.first->second = buffer; + } } } mDeallocating.erase(origBid);