Merge "codec2: add color formats for image component" into qt-r1-dev am: 63c43a3eca

am: d5af5ad09d

Change-Id: I12901313ab9b7f20d30ba71a7260faa7b0dd64cd

media/codec2/sfplugin/Codec2InfoBuilder.cpp

@@ -194,7 +194,8 @@ void addSupportedColorFormats(
     // TODO: get this from intf() as well, but how do we map them to
     // MediaCodec color formats?
     bool encoder = trait.kind == C2Component::KIND_ENCODER;
-    if (mediaType.find("video") != std::string::npos) {
+    if (mediaType.find("video") != std::string::npos
+            || mediaType.find("image") != std::string::npos) {
         // vendor video codecs prefer opaque format
         if (trait.name.find("android") == std::string::npos) {
             caps->addColorFormat(COLOR_FormatSurface);