C2: add support for channel mask
Bug: 198197610
Bug: 211823739
Test: atest DecoderTestAacFormat
Change-Id: I73916f2ed5709f5dca35d9f67f23f2cb7c08d1db
diff --git a/media/codec2/core/include/C2Config.h b/media/codec2/core/include/C2Config.h
index 70e742c..07c2864 100644
--- a/media/codec2/core/include/C2Config.h
+++ b/media/codec2/core/include/C2Config.h
@@ -277,6 +277,9 @@
// encoding statistics, average block qp of a frame
kParamIndexAverageBlockQuantization, // int32
+
+ // channel mask for decoded audio
+ kParamIndexAndroidChannelMask, // uint32
};
}
@@ -1981,6 +1984,14 @@
constexpr char C2_PARAMKEY_MAX_CODED_CHANNEL_COUNT[] = "coded.max-channel-count";
/**
+ * Audio channel mask. Used by decoder to express audio channel mask of decoded content.
+ * Channel representation is specified according to the Java android.media.AudioFormat
+ * CHANNEL_OUT_* constants.
+ */
+ typedef C2StreamParam<C2Info, C2Uint32Value, kParamIndexAndroidChannelMask> C2StreamChannelMaskInfo;
+ const char C2_PARAMKEY_CHANNEL_MASK[] = "raw.channel-mask";
+
+/**
* Audio sample format (PCM encoding)
*/
C2ENUM(C2Config::pcm_encoding_t, uint32_t,