Module: libav Branch: master Commit: 2725ce7c7c341b174010f0fe3e00a7199341dfc9
Author: Justin Ruggles <[email protected]> Committer: Justin Ruggles <[email protected]> Date: Sat Aug 25 19:09:40 2012 -0400 wmalossless: output in planar sample format --- libavcodec/wmalosslessdec.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index df02528..2d8754f 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -186,9 +186,9 @@ static av_cold int decode_init(AVCodecContext *avctx) channel_mask = AV_RL32(edata_ptr + 2); s->bits_per_sample = AV_RL16(edata_ptr); if (s->bits_per_sample == 16) - avctx->sample_fmt = AV_SAMPLE_FMT_S16; + avctx->sample_fmt = AV_SAMPLE_FMT_S16P; else if (s->bits_per_sample == 24) { - avctx->sample_fmt = AV_SAMPLE_FMT_S32; + avctx->sample_fmt = AV_SAMPLE_FMT_S32P; av_log_missing_feature(avctx, "bit-depth higher than 16", 0); return AVERROR_PATCHWELCOME; } else { @@ -984,11 +984,9 @@ static int decode_subframe(WmallDecodeCtx *s) for (j = 0; j < subframe_len; j++) { if (s->bits_per_sample == 16) { - *s->samples_16[c] = (int16_t) s->channel_residues[c][j] << padding_zeroes; - s->samples_16[c] += s->num_channels; + *s->samples_16[c]++ = (int16_t) s->channel_residues[c][j] << padding_zeroes; } else { - *s->samples_32[c] = s->channel_residues[c][j] << padding_zeroes; - s->samples_32[c] += s->num_channels; + *s->samples_32[c]++ = s->channel_residues[c][j] << padding_zeroes; } } } @@ -1025,8 +1023,8 @@ static int decode_frame(WmallDecodeCtx *s) return ret; } for (i = 0; i < s->num_channels; i++) { - s->samples_16[i] = (int16_t *)s->frame.data[0] + i; - s->samples_32[i] = (int32_t *)s->frame.data[0] + i; + s->samples_16[i] = (int16_t *)s->frame.extended_data[i]; + s->samples_32[i] = (int32_t *)s->frame.extended_data[i]; } /* get frame length */ @@ -1296,4 +1294,7 @@ AVCodec ff_wmalossless_decoder = { .flush = flush, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1 | CODEC_CAP_DELAY, .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Lossless"), + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_NONE }, }; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
