diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2013-11-22 17:25:48 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-11-22 23:27:33 +0100 |
| commit | b53285462263ef8a795f0e289abd5799b4c57652 (patch) | |
| tree | 67fb718c424c2ac1f584368305d153c14f03ee2e | |
| parent | c16bfb147df8a9d350e8a0dbc01937b78faf5949 (diff) | |
| download | ffmpeg-streaming-b53285462263ef8a795f0e289abd5799b4c57652.zip ffmpeg-streaming-b53285462263ef8a795f0e289abd5799b4c57652.tar.gz | |
ac3: implement request_channel_layout.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -rw-r--r-- | libavcodec/aac_ac3_parser.c | 20 | ||||
| -rw-r--r-- | libavcodec/ac3dec.c | 34 |
2 files changed, 41 insertions, 13 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 00d95ad..d3da9b7 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "parser.h" #include "aac_ac3_parser.h" @@ -83,9 +84,22 @@ get_next: avctx->sample_rate = s->sample_rate; /* (E-)AC-3: allow downmixing to stereo or mono */ - if (avctx->request_channels > 0 && avctx->request_channels <= 2 && - avctx->request_channels < s->channels) { - avctx->channels = avctx->request_channels; +#if FF_API_REQUEST_CHANNELS +FF_DISABLE_DEPRECATION_WARNINGS + if (avctx->request_channels == 1) + avctx->request_channel_layout = AV_CH_LAYOUT_MONO; + else if (avctx->request_channels == 2) + avctx->request_channel_layout = AV_CH_LAYOUT_STEREO; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + if (s->channels > 1 && + avctx->request_channel_layout == AV_CH_LAYOUT_MONO) { + avctx->channels = 1; + avctx->channel_layout = AV_CH_LAYOUT_MONO; + } else if (s->channels > 2 && + avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) { + avctx->channels = 2; + avctx->channel_layout = AV_CH_LAYOUT_STEREO; } else { avctx->channels = s->channels; avctx->channel_layout = s->channel_layout; diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 6419208..9086a2a 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -29,6 +29,7 @@ #include <math.h> #include <string.h> +#include "libavutil/channel_layout.h" #include "libavutil/crc.h" #include "libavutil/opt.h" #include "internal.h" @@ -178,10 +179,20 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; /* allow downmixing to stereo or mono */ - if (avctx->request_channels > 0 && avctx->request_channels <= 2 && - avctx->request_channels < avctx->channels) { - avctx->channels = avctx->request_channels; - } +#if FF_API_REQUEST_CHANNELS +FF_DISABLE_DEPRECATION_WARNINGS + if (avctx->request_channels == 1) + avctx->request_channel_layout = AV_CH_LAYOUT_MONO; + else if (avctx->request_channels == 2) + avctx->request_channel_layout = AV_CH_LAYOUT_STEREO; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + if (avctx->channels > 1 && + avctx->request_channel_layout == AV_CH_LAYOUT_MONO) + avctx->channels = 1; + else if (avctx->channels > 2 && + avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) + avctx->channels = 2; s->downmixed = 1; for (i = 0; i < AC3_MAX_CHANNELS; i++) { @@ -1348,14 +1359,17 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, s->output_mode = s->channel_mode; if (s->lfe_on) s->output_mode |= AC3_OUTPUT_LFEON; - if (avctx->request_channels > 0 && avctx->request_channels <= 2 && - avctx->request_channels < s->channels) { - s->out_channels = avctx->request_channels; - s->output_mode = avctx->request_channels == 1 ? AC3_CHMODE_MONO : AC3_CHMODE_STEREO; - s->channel_layout = avpriv_ac3_channel_layout_tab[s->output_mode]; + if (s->channels > 1 && + avctx->request_channel_layout == AV_CH_LAYOUT_MONO) { + s->out_channels = 1; + s->output_mode = AC3_CHMODE_MONO; + } else if (s->channels > 2 && + avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) { + s->out_channels = 2; + s->output_mode = AC3_CHMODE_STEREO; } avctx->channels = s->out_channels; - avctx->channel_layout = s->channel_layout; + avctx->channel_layout = avpriv_ac3_channel_layout_tab[s->output_mode]; /* set downmixing coefficients if needed */ if (s->channels != s->out_channels && !((s->output_mode & AC3_OUTPUT_LFEON) && |
