diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2012-01-12 16:06:20 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-14 01:17:06 +0100 |
| commit | 89fc7e36c7cb5db22ab9c0ab26fa3018410fd235 (patch) | |
| tree | ff9966b2cd1ec17c26515ffbeb0a55cff0bb3191 /libavcodec | |
| parent | 8d95eb6702b46cd07385c5478b10924ea78e6f18 (diff) | |
alacdec: support 32 bps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/alac.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 70e1a6438b..83e0d810e6 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -351,6 +351,17 @@ static void interleave_stereo_24(int32_t *buffer[MAX_CHANNELS], } } +static void interleave_stereo_32(int32_t *buffer[MAX_CHANNELS], + int32_t *buffer_out, int numsamples) +{ + int i; + + for (i = 0; i < numsamples; i++) { + *buffer_out++ = buffer[0][i]; + *buffer_out++ = buffer[1][i]; + } +} + static int alac_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { @@ -533,6 +544,16 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data, outbuffer[i] = alac->outputsamples_buffer[0][i] << 8; } break; + case 32: + if (channels == 2) { + interleave_stereo_32(alac->outputsamples_buffer, + (int32_t *)alac->frame.data[0], outputsamples); + } else { + int32_t *outbuffer = (int32_t *)alac->frame.data[0]; + for (i = 0; i < outputsamples; i++) + outbuffer[i] = alac->outputsamples_buffer[0][i]; + } + break; } if (input_buffer_size * 8 - get_bits_count(&alac->gb) > 8) @@ -628,6 +649,7 @@ static av_cold int alac_decode_init(AVCodecContext * avctx) switch (alac->setinfo_sample_size) { case 16: avctx->sample_fmt = AV_SAMPLE_FMT_S16; break; + case 32: case 24: avctx->sample_fmt = AV_SAMPLE_FMT_S32; break; default: av_log_ask_for_sample(avctx, "Sample depth %d is not supported.\n", |