commit 75efb6171008f157bb70588f06dd5626fb937126
author Tomoharu Kasahara <tomoharu.kasahara@sony.com> Thu Nov 08 09:36:00 2018 -0800
committer android-build-merger <android-build-merger@google.com> Thu Nov 08 09:36:00 2018 -0800
tree 55e0557103dc52a52d7b0d6aa1b58c8ea4d229c1
parent 54163af616f8cc5d1efa20385cfdff3fdb065eb5
parent 3cebe702d016f25d91ab9904488f9d02422ac89b

Merge "Use channel count for CHANNEL_MASK_USE_CHANNEL_ORDER" am: 413b0b2299
am: 3cebe702d0

Change-Id: Iaed34008782d119a4439a27d22d5b796917fc0b9

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