commit cbf6251bf7f0ee3b13f3033604273828538567d0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Dec 06 00:02:59 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Dec 06 00:02:59 2023 +0000
tree 1d076c134df3be11c033c5148dece6e325b480d3
parent 112cd99277ac073907c7f3c6f978e51eb4a711cd
parent fe2f6f8eecb7848c533741f9012ddb269dadbbe8

Snap for 11180250 from fe2f6f8eecb7848c533741f9012ddb269dadbbe8 to 24Q1-release

Change-Id: Iff105657593344749c510187f97079cf95424afd

system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp

diff --git a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
index 81366dd..f9a7a3f 100644
--- a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
+++ b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp
@@ -869,15 +869,15 @@
     if (!mOldPts2Index.empty()) {
         auto iter = mOldPts2Index.find(pts);
         if (iter != mOldPts2Index.end()) {
-            mOldPts2Index.erase(iter);
             index = iter->second;
+            mOldPts2Index.erase(iter);
             found = true;
         }
     } else {
         auto iter = mPts2Index.find(pts);
         if (iter != mPts2Index.end()) {
-            mPts2Index.erase(iter);
             index = iter->second;
+            mPts2Index.erase(iter);
             found = true;
         }
     }

system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp

diff --git a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
index 14eed1f..173dd38 100644
--- a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
+++ b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
@@ -816,15 +816,15 @@
     if (!mOldPts2Index.empty()) {
         auto iter = mOldPts2Index.find(pts);
         if (iter != mOldPts2Index.end()) {
-            mOldPts2Index.erase(iter);
             index = iter->second;
+            mOldPts2Index.erase(iter);
             found = true;
         }
     } else {
         auto iter = mPts2Index.find(pts);
         if (iter != mPts2Index.end()) {
-            mPts2Index.erase(iter);
             index = iter->second;
+            mPts2Index.erase(iter);
             found = true;
         }
     }