commit 3bd9e0e1a16a4fbe74c4edbe8be7069f988e9c2c
author Chong Zhang <chz@google.com> Wed Jun 19 22:56:32 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 19 22:56:32 2019 -0700
tree bf0e547188bc889bee5bc68842e009bf2553ee8d
parent 31a81a35174b909b8c58ce59bdf468f4e3e555e5
parent 29081e67bbf0355d4966e25206ccafffd52422b3

Merge "stagefright: Fix OmxInfoBuilder assignment of kFlagIsHardwareAccelerated" into qt-dev
am: 29081e67bb

Change-Id: I99a45446b353328d12b2c15d805013f3453799e3

media/libstagefright/OmxInfoBuilder.cpp

diff --git a/media/libstagefright/OmxInfoBuilder.cpp b/media/libstagefright/OmxInfoBuilder.cpp
index 8910463..79ffdeb 100644
--- a/media/libstagefright/OmxInfoBuilder.cpp
+++ b/media/libstagefright/OmxInfoBuilder.cpp
@@ -193,7 +193,7 @@
                 // treat OMX.google codecs as non-hardware-accelerated and non-vendor
                 if (!isSoftware) {
                     attrs |= MediaCodecInfo::kFlagIsVendor;
-                    if (std::count_if(
+                    if (!std::count_if(
                             node.attributes.begin(), node.attributes.end(),
                             [](const IOmxStore::Attribute &i) -> bool {
                                 return i.key == "attribute::software-codec";