Respect channel mask in ACodec and NuPlayer.

Refactor conversion from MetaData into AMessage while we're at it.

Change-Id: I5479129836ea4316e8de28cf1b472bf19e3ac4ab
related-to-bug: 6439076

2 files changed, 13 insertions, 2 deletions

diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index 72827c1..7536d10 100644
--- a/include/media/stagefright/ACodec.h
+++ b/include/media/stagefright/ACodec.h
@@ -121,8 +121,6 @@ private:
     sp<ExecutingToIdleState> mExecutingToIdleState;
     sp<IdleToLoadedState> mIdleToLoadedState;
     sp<FlushingState> mFlushingState;
-    int32_t mEncoderDelay;
-    int32_t mEncoderPadding;
     sp<SkipCutBuffer> mSkipCutBuffer;
 
     AString mComponentName;
@@ -149,6 +147,12 @@ private:
     // and do not release the component instance.
     bool mKeepComponentAllocated;
 
+    int32_t mEncoderDelay;
+    int32_t mEncoderPadding;
+
+    bool mChannelMaskPresent;
+    int32_t mChannelMask;
+
     status_t allocateBuffersOnPort(OMX_U32 portIndex);
     status_t freeBuffersOnPort(OMX_U32 portIndex);
     status_t freeBuffer(OMX_U32 portIndex, size_t i);
diff --git a/include/media/stagefright/Utils.h b/include/media/stagefright/Utils.h
index 498b525..d87902e 100644
--- a/include/media/stagefright/Utils.h
+++ b/include/media/stagefright/Utils.h
@@ -19,6 +19,8 @@
 #define UTILS_H_
 
 #include <stdint.h>
+#include <utils/Errors.h>
+#include <utils/RefBase.h>
 
 namespace android {
 
@@ -36,6 +38,11 @@ uint64_t U64LE_AT(const uint8_t *ptr);
 uint64_t ntoh64(uint64_t x);
 uint64_t hton64(uint64_t x);
 
+struct MetaData;
+struct AMessage;
+status_t convertMetaDataToMessage(
+        const sp<MetaData> &meta, sp<AMessage> *format);
+
 }  // namespace android
 
 #endif  // UTILS_H_