diff options
-rw-r--r-- | system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp | 4 | ||||
-rw-r--r-- | system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp | 4 | ||||
-rw-r--r-- | system/hwc3/HostFrameComposer.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp index 81366dd6..f9a7a3f5 100644 --- a/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp +++ b/system/codecs/c2/decoders/avcdec/C2GoldfishAvcDec.cpp @@ -869,15 +869,15 @@ void C2GoldfishAvcDec::removePts(uint64_t pts) { 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; } } diff --git a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp index 14eed1f6..173dd386 100644 --- a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp +++ b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp @@ -816,15 +816,15 @@ void C2GoldfishHevcDec::removePts(uint64_t pts) { 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; } } diff --git a/system/hwc3/HostFrameComposer.cpp b/system/hwc3/HostFrameComposer.cpp index 6264052e..d82ece64 100644 --- a/system/hwc3/HostFrameComposer.cpp +++ b/system/hwc3/HostFrameComposer.cpp @@ -60,10 +60,10 @@ hwc_frect AsHwcFrect(const common::FRect& rect) { 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; } |