commit 9e43a105776d108a9a6ab98eea3e805ceb29e593
author Marco Nelissen <marcone@google.com> Mon Sep 19 20:33:24 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 19 20:33:24 2016 +0000
tree 8025c6c5bd887693c793b3b3cc5b692c53c85d99
parent 50d06c8849450ebfacc6878962b9fc2937b2e435
parent ca4c68f25eb61f4d4e339e99cf63f863adc52fdd

Merge "stagefright: fix finding hardware codec"

media/libstagefright/MediaCodecList.cpp

diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp
index f75706b..8afb7e9 100644
--- a/media/libstagefright/MediaCodecList.cpp
+++ b/media/libstagefright/MediaCodecList.cpp
@@ -1165,7 +1165,9 @@
         CHECK(info != NULL);
         AString componentName = info->getCodecName();
 
-        if (!((flags & kHardwareCodecsOnly) && !isSoftwareCodec(componentName))) {
+        if ((flags & kHardwareCodecsOnly) && isSoftwareCodec(componentName)) {
+            ALOGV("skipping SW codec '%s'", componentName.c_str());
+        } else {
             matches->push(componentName);
             ALOGV("matching '%s'", componentName.c_str());
         }