commit 866298e73ea53bc303859a7a20a9219a8850043f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jan 04 19:48:34 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jan 04 19:48:34 2024 +0000
tree 2da213c23e6a3261470e6cf1da8f7dcff07a67ac
parent 9ad216e46c2bddbcee4e5ba6b1b35b0b7db8c07e
parent eebc592ee23940d44db20f78bfb4cdb50533416b

Snap for 11274957 from eebc592ee23940d44db20f78bfb4cdb50533416b to mainline-adservices-release

Change-Id: I31434bf0913c00ec946c30dbc2eebd8cc4750b62

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;
         }
     }

system/hwc3/HostFrameComposer.cpp

diff --git a/system/hwc3/HostFrameComposer.cpp b/system/hwc3/HostFrameComposer.cpp
index 6264052..d82ece6 100644
--- a/system/hwc3/HostFrameComposer.cpp
+++ b/system/hwc3/HostFrameComposer.cpp
@@ -60,10 +60,10 @@
 
 hwc_color AsHwcColor(const Color& color) {
   hwc_color out;
-  out.r = color.r;
-  out.g = color.g;
-  out.b = color.b;
-  out.a = color.a;
+  out.r = static_cast<uint8_t>(color.r * 255.0f);
+  out.g = static_cast<uint8_t>(color.g * 255.0f);
+  out.b = static_cast<uint8_t>(color.b * 255.0f);
+  out.a = static_cast<uint8_t>(color.a * 255.0f);
   return out;
 }