commit 142c49942474e832674ab45325b549484f76437a
author android-build-team Robot <android-build-team-robot@google.com> Thu Jul 11 19:50:20 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jul 11 19:50:20 2019 +0000
tree 1d4b0a14637e186f2b02dd7a1205cd7a2285b3ea
parent 162ba6e93e518a0ec8456b174ed63669c3bc75cb
parent 16915d7bc30666a9bfcc17471416abcb0b81651c

Merge cherrypicks of [8549820, 8549668, 8549613, 8549614, 8549935, 8549808, 8549876, 8549809, 8549552] into qt-release

Change-Id: I43eff6782e25da76be71460fdf07f992a15e5c39

media/codec2/sfplugin/Codec2InfoBuilder.cpp

diff --git a/media/codec2/sfplugin/Codec2InfoBuilder.cpp b/media/codec2/sfplugin/Codec2InfoBuilder.cpp
index c54c601..6b75eba 100644
--- a/media/codec2/sfplugin/Codec2InfoBuilder.cpp
+++ b/media/codec2/sfplugin/Codec2InfoBuilder.cpp
@@ -194,7 +194,8 @@
     // 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);