diff options
author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-07-09 22:36:03 +0400 |
---|---|---|
committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-07-19 21:26:48 +0400 |
commit | 6482bd8831904ab7cd0a126687f871ff9c52b055 (patch) | |
tree | 8588c76d5a047b4d62d338f86bb7b427f0be2d89 /libavcodec/alac.c | |
parent | 6cda74c155a10bec7321d8c0c5be6fd3d809f41b (diff) |
alac: add 32-bit decoding support
Diffstat (limited to 'libavcodec/alac.c')
-rw-r--r-- | libavcodec/alac.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index df3c3148eb..268d592325 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -424,6 +424,18 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data, *outbuffer++ = alac->output_samples_buffer[1][i] << 8; }} break; + case 32: + if (channels == 2) { + int32_t *outbuffer = (int32_t *)alac->frame.data[0]; + for (i = 0; i < alac->nb_samples; i++) { + *outbuffer++ = alac->output_samples_buffer[0][i]; + *outbuffer++ = alac->output_samples_buffer[1][i]; + } + } else { + memcpy(alac->frame.data[0], alac->output_samples_buffer[0], + alac->nb_samples * sizeof(*alac->output_samples_buffer[0])); + } + break; } if (avpkt->size * 8 - get_bits_count(&alac->gb) > 8) @@ -520,7 +532,8 @@ static av_cold int alac_decode_init(AVCodecContext * avctx) switch (alac->sample_size) { case 16: avctx->sample_fmt = AV_SAMPLE_FMT_S16; break; - case 24: avctx->sample_fmt = AV_SAMPLE_FMT_S32; + case 24: + case 32: avctx->sample_fmt = AV_SAMPLE_FMT_S32; break; default: av_log_ask_for_sample(avctx, "Sample depth %d is not supported.\n", alac->sample_size); |