On Fri, Sep 21, 2012 at 11:23:48AM -0400, Justin Ruggles wrote:
> ---
> libavcodec/wmalosslessdec.c | 17 +++++++++--------
> 1 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
> index 56e9aad..300c66a 100644
> --- a/libavcodec/wmalosslessdec.c
> +++ b/libavcodec/wmalosslessdec.c
> @@ -184,9 +184,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 {
> @@ -980,11 +980,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;
> }
> }
> }
> @@ -1021,8 +1019,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 */
> @@ -1290,4 +1288,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 },
> };
> --
LGTM
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
