Merge "[DO NOT MERGE] Fix enum-compare-switch warning"
diff --git a/media/libstagefright/codec2/tests/C2Param_test.cpp b/media/libstagefright/codec2/tests/C2Param_test.cpp
index ec82c84..786e988 100644
--- a/media/libstagefright/codec2/tests/C2Param_test.cpp
+++ b/media/libstagefright/codec2/tests/C2Param_test.cpp
@@ -2479,11 +2479,11 @@
for (const FD::named_value_type &p : f.namedValues()) {
cout << sep << p.first << "=";
switch (f.type()) {
- case C2Value::INT32: cout << get(p.second, (int32_t *)0); break;
- case C2Value::INT64: cout << get(p.second, (int64_t *)0); break;
- case C2Value::UINT32: cout << get(p.second, (uint32_t *)0); break;
- case C2Value::UINT64: cout << get(p.second, (uint64_t *)0); break;
- case C2Value::FLOAT: cout << get(p.second, (float *)0); break;
+ case C2FieldDescriptor::INT32: cout << get(p.second, (int32_t *)0); break;
+ case C2FieldDescriptor::INT64: cout << get(p.second, (int64_t *)0); break;
+ case C2FieldDescriptor::UINT32: cout << get(p.second, (uint32_t *)0); break;
+ case C2FieldDescriptor::UINT64: cout << get(p.second, (uint64_t *)0); break;
+ case C2FieldDescriptor::FLOAT: cout << get(p.second, (float *)0); break;
default: cout << "???"; break;
}
sep = ",";
