commit cf3717c09d5e654ae8021ee63a206a89e836bd77
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Jun 03 06:40:06 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 03 06:40:06 2022 +0000
tree 2499fce1c1c03c89046c35d65c37bebd6555e827
parent fbadcc316facf85b0e127ef821bf5827450317e3
parent 1d1d7e741e1b78a26949a23c16d44ac920160e5c

[automerger skipped] c2 vp9, av1: enable P010 only for devices launching with T am: c804bd960c am: 756eb6bac9 -s ours am: 1d1d7e741e -s ours

am skip reason: Merged-In Ib8ccdf8c6073155fd6189c9ed2510d75951dfb75 with SHA-1 c804bd960c is already in history

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

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

media/libstagefright/HevcUtils.cpp

diff --git a/media/libstagefright/HevcUtils.cpp b/media/libstagefright/HevcUtils.cpp
index 5f9c20e..60df162 100644
--- a/media/libstagefright/HevcUtils.cpp
+++ b/media/libstagefright/HevcUtils.cpp
@@ -102,10 +102,11 @@
 static bool findParam(uint32_t key, T *param,
         KeyedVector<uint32_t, uint64_t> &params) {
     CHECK(param);
-    if (params.indexOfKey(key) < 0) {
+    ssize_t index = params.indexOfKey(key);
+    if (index < 0) {
         return false;
     }
-    *param = (T) params[key];
+    *param = (T) params[index];
     return true;
 }