commit c25db9303131d04d15f2ca28f1a8f9153becf449
author Tomoharu Kasahara <tomoharu.kasahara@sony.com> Thu Nov 08 09:40:56 2018 -0800
committer android-build-merger <android-build-merger@google.com> Thu Nov 08 09:40:56 2018 -0800
tree 08c59ac75b7e845d75c2cf99b139e40ec31b9a58
parent d31283885b1d992ec59b94bee970400ab812c6ca
parent 75efb6171008f157bb70588f06dd5626fb937126

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

Change-Id: Id8f4fab9c57d2621987b93a0755caad3bcef6aab

media/libstagefright/Utils.cpp

diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index 96993e9..30c4695 100644
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -1800,7 +1800,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