diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2013-11-23 23:36:21 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-28 21:10:29 +0100 |
| commit | 89de5157b1cbe7807d3ec1d51bd56a75e98c002e (patch) | |
| tree | aa8ea8ccb65efd4f88cccb08ec4d4a16811a30c5 /libavcodec/dcadec.c | |
| parent | cf7860db608df7c76471d8b61f07abbd5aad8dd5 (diff) | |
| download | ffmpeg-89de5157b1cbe7807d3ec1d51bd56a75e98c002e.tar.gz | |
dcadec: implement request_channel_layout.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 7af5e5c51a..944736f715 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1288,7 +1288,8 @@ static int dca_filter_channels(DCAContext *s, int block_index) } /* Down mixing */ - if (s->avctx->request_channels == 2 && s->prim_channels > 2) { + if (s->prim_channels > 2 && + s->avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) { dca_downmix(s->samples_chanptr, s->amode, s->downmix_coef, s->channel_order_tab); } @@ -1803,8 +1804,14 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data, if (s->amode < 16) { avctx->channel_layout = dca_core_channel_layout[s->amode]; +#if FF_API_REQUEST_CHANNELS +FF_DISABLE_DEPRECATION_WARNINGS if (s->xch_present && (!avctx->request_channels || avctx->request_channels > num_core_channels + !!s->lfe)) { +FF_ENABLE_DEPRECATION_WARNINGS +#else + if (s->xch_present) { +#endif avctx->channel_layout |= AV_CH_BACK_CENTER; if (s->lfe) { avctx->channel_layout |= AV_CH_LOW_FREQUENCY; @@ -1826,7 +1833,8 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data, s->channel_order_tab[channels - 1 - !!s->lfe] < 0) return AVERROR_INVALIDDATA; - if (avctx->request_channels == 2 && s->prim_channels > 2) { + if (s->prim_channels > 2 && + avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) { channels = 2; s->output = DCA_STEREO; avctx->channel_layout = AV_CH_LAYOUT_STEREO; @@ -1922,9 +1930,15 @@ static av_cold int dca_decode_init(AVCodecContext *avctx) avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; /* allow downmixing to stereo */ - if (avctx->channels > 2 && avctx->request_channels == 2) { - avctx->channels = avctx->request_channels; - } +#if FF_API_REQUEST_CHANNELS +FF_DISABLE_DEPRECATION_WARNINGS + if (avctx->request_channels == 2) + avctx->request_channel_layout = AV_CH_LAYOUT_STEREO; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + if (avctx->channels > 2 && + avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) + avctx->channels = 2; return 0; } |