virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

dcadec: implement request_channel_layout.

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Tim Walker 2013-11-23 23:36:21 +01:00 committed by Anton Khirnov
parent cf7860db60
commit 89de5157b1
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/dcadec.c
View File

@ -1288,7 +1288,8 @@ static int dca_filter_channels(DCAContext *s, int block_index)
} }
/* Down mixing */ /* 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); 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) { if (s->amode < 16) {
avctx->channel_layout = dca_core_channel_layout[s->amode]; 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 || if (s->xch_present && (!avctx->request_channels ||
avctx->request_channels > num_core_channels + !!s->lfe)) { 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; avctx->channel_layout |= AV_CH_BACK_CENTER;
if (s->lfe) { if (s->lfe) {
avctx->channel_layout |= AV_CH_LOW_FREQUENCY; 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) s->channel_order_tab[channels - 1 - !!s->lfe] < 0)
return AVERROR_INVALIDDATA; 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; channels = 2;
s->output = DCA_STEREO; s->output = DCA_STEREO;
avctx->channel_layout = AV_CH_LAYOUT_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; avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
/* allow downmixing to stereo */ /* allow downmixing to stereo */
if (avctx->channels > 2 && avctx->request_channels == 2) { #if FF_API_REQUEST_CHANNELS
avctx->channels = avctx->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; return 0;
} }