aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dcadec.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2019-05-29 08:13:23 +0200
committerJames Almer <jamrial@gmail.com>2022-03-15 09:42:41 -0300
commitb2af4bc807cfc62d61213c6050aac26ec8a1e675 (patch)
tree88e8e19480ac99f1dfcf2a618421a0bc2eef725a /libavcodec/dcadec.h
parentfa0c8a753e4851cfabf08fb558b0ca2616f27bbc (diff)
downloadffmpeg-b2af4bc807cfc62d61213c6050aac26ec8a1e675.tar.gz
dca: convert to new channel layout API
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/dcadec.h')
-rw-r--r--libavcodec/dcadec.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/dcadec.h b/libavcodec/dcadec.h
index 0f371eca14..0ff28dd4d1 100644
--- a/libavcodec/dcadec.h
+++ b/libavcodec/dcadec.h
@@ -45,6 +45,11 @@
#define DCA_PACKET_RECOVERY 0x10 ///< Sync error recovery flag
#define DCA_PACKET_RESIDUAL 0x20 ///< Core valid for residual decoding
+enum DCAOutputChannelOrder {
+ CHANNEL_ORDER_DEFAULT,
+ CHANNEL_ORDER_CODED,
+};
+
typedef struct DCAContext {
const AVClass *class; ///< class for AVOptions
AVCodecContext *avctx;
@@ -65,6 +70,8 @@ typedef struct DCAContext {
int request_channel_layout; ///< Converted from avctx.request_channel_layout
int core_only; ///< Core only decoding flag
+ int output_channel_order;
+ AVChannelLayout downmix_layout;
} DCAContext;
int ff_dca_set_channel_layout(AVCodecContext *avctx, int *ch_remap, int dca_mask);