commit 413b0b2299b6131e60c24e3ae807c4ba22f99699
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 08 17:19:26 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 08 17:19:26 2018 +0000
tree e649efceb1b8b0d632f64af39238da7ab411bdb2
parent 4d16ee4f1092960f58ecaec03beb5ff10898ade3
parent a6132928a69453759619cdc9907fc07dd77f14a0

Merge "Use channel count for CHANNEL_MASK_USE_CHANNEL_ORDER"

media/libstagefright/Utils.cpp

diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index 7f39ab3..1e057fb 100644
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -1718,7 +1718,7 @@
     info.sample_rate = srate;
 
     int32_t cmask = 0;
-    if (!meta->findInt32(kKeyChannelMask, &cmask)) {
+    if (!meta->findInt32(kKeyChannelMask, &cmask) || cmask == CHANNEL_MASK_USE_CHANNEL_ORDER) {
         ALOGV("track of type '%s' does not publish channel mask", mime);
 
         // Try a channel count instead