Fix C2StreamUsageTuning work for Linear Block model.
Because C2FieldSupportedValues has a default flag value 0, it causes
CCodec2 always to get minUsage with 0. So, Codec2 has no opportunity
to update the memory usage for fetchLinearBlock. Here, we change the
flow to let CCodec2 choose the second supported value if the supported
value number is larger than 1. So, Codec2 can decide the memory usage
for fetchLinearBlock to get the required memory attributes.
[Test Report]
Vendor DTV test: OK
Bug: 187972014
Change-Id: I691295330f061958bac3ebe80617c7c79a983420
diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 5c387b3..59cabe2 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -2549,7 +2549,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;