diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-12-21 12:51:08 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-12-21 14:11:12 +0000 |
| commit | ae27b70b9d9dfb0c1e09b6dfcd2fd74fffc5bbac (patch) | |
| tree | c73f45f00f299455703a11e4311c3343b991839a | |
| parent | 29707f5ba6ff34b2ed89f3af0c00e1b3c01ac9b1 (diff) | |
| download | ffmpeg-ae27b70b9d9dfb0c1e09b6dfcd2fd74fffc5bbac.tar.gz | |
alsdec: channel sorting
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavcodec/alsdec.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 1f725a1730..7133bfd9af 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -355,11 +355,16 @@ static av_cold int read_specific_config(ALSDecContext *ctx) if (!(sconf->chan_pos = av_malloc(avctx->channels * sizeof(*sconf->chan_pos)))) return AVERROR(ENOMEM); - for (i = 0; i < avctx->channels; i++) + for (i = 0; i < avctx->channels; i++) { sconf->chan_pos[i] = get_bits(&gb, chan_pos_bits); + if (sconf->chan_pos[i] >= avctx->channels) { + av_log(avctx, AV_LOG_WARNING, "Invalid original channel position.\n"); + sconf->chan_sort = 0; + break; + } + } align_get_bits(&gb); - // TODO: use this to actually do channel sorting } else { sconf->chan_sort = 0; } @@ -430,7 +435,6 @@ static int check_specific_config(ALSDecContext *ctx) MISSING_ERR(sconf->floating, "Floating point decoding", AVERROR_PATCHWELCOME); MISSING_ERR(sconf->rlslms, "Adaptive RLS-LMS prediction", AVERROR_PATCHWELCOME); - MISSING_ERR(sconf->chan_sort, "Channel sorting", 0); return error; } @@ -1480,9 +1484,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, { \ int##bps##_t *dest = (int##bps##_t*)ctx->frame.data[0]; \ shift = bps - ctx->avctx->bits_per_raw_sample; \ + if (!sconf->chan_sort) { \ for (sample = 0; sample < ctx->cur_frame_length; sample++) \ for (c = 0; c < avctx->channels; c++) \ *dest++ = ctx->raw_samples[c][sample] << shift; \ + } else { \ + for (sample = 0; sample < ctx->cur_frame_length; sample++) \ + for (c = 0; c < avctx->channels; c++) \ + *dest++ = ctx->raw_samples[sconf->chan_pos[c]][sample] << shift; \ + } \ } if (ctx->avctx->bits_per_raw_sample <= 16) { |