commit ace31cd04a8dfc37d488c8118818525ae8a733ed
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 12 00:39:16 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 12 00:39:16 2019 +0000
tree 77befd5d2a365b9f0c1d6d542f95e534c38763e8
parent 20b29ddacc0acc04706882e1b006ad8589c52698
parent 2cd83c9fbbd286768999ade97f7fce4b409b06c4

Merge "Skip secure decoders in C2 VTS" into qt-dev

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);