commit bafea101e3fcb1af9d5ea6df0c97402d67473a86
author Henry Fang <quxiangfang@google.com> Fri May 14 19:17:15 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 14 19:17:15 2021 +0000
tree bc9207ef2bb2a708561ffcc575ef059e48825884
parent f2175d3cba403c5cec63b6c597e3617c5221306e
parent 7282609729f09e39daef1442e25284f98f06eac8

Merge "Fix C2StreamUsageTuning work for Linear Block model." am: 2485469ffd am: 7282609729

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

Change-Id: I6fec166a354bfa4f8a267d0c6fce74292683a3ba

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 12b9605..d942606 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -2656,7 +2656,11 @@
             *maxUsage = 0;
             continue;
         }
-        *minUsage |= supported.values[0].u64;
+        if (supported.values.size() > 1) {
+            *minUsage |= supported.values[1].u64;
+        } else {
+            *minUsage |= supported.values[0].u64;
+        }
         int64_t currentMaxUsage = 0;
         for (const C2Value::Primitive &flags : supported.values) {
             currentMaxUsage |= flags.u64;