RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

alac: simplify channel interleaving 

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
This commit is contained in:
Andrew D'Addesio 2012-07-09 14:34:41 -04:00 committed by Justin Ruggles
parent 5138ff143f
commit 6cda74c155
1 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
libavcodec/alac.c
View File

@ -266,28 +266,6 @@ static void append_extra_bits(int32_t *buffer[MAX_CHANNELS],
buffer[ch][i] = (buffer[ch][i] << extra_bits) | extra_bits_buffer[ch][i];
}
static void interleave_stereo_16(int32_t *buffer[MAX_CHANNELS],
int16_t *buffer_out, int numsamples)
{
int i;
for (i = 0; i < numsamples; i++) {
*buffer_out++ = buffer[0][i];
*buffer_out++ = buffer[1][i];
}
}
static void interleave_stereo_24(int32_t *buffer[MAX_CHANNELS],
int32_t *buffer_out, int numsamples)
{
int i;
for (i = 0; i < numsamples; i++) {
*buffer_out++ = buffer[0][i] << 8;
*buffer_out++ = buffer[1][i] << 8;
}
}
static int alac_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt)
{
@ -430,28 +408,21 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data,
}
switch(alac->sample_size) {
case 16:
if (channels == 2) {
interleave_stereo_16(alac->output_samples_buffer,
(int16_t *)alac->frame.data[0],
alac->nb_samples);
} else {
int16_t *outbuffer = (int16_t *)alac->frame.data[0];
for (i = 0; i < alac->nb_samples; i++) {
outbuffer[i] = alac->output_samples_buffer[0][i];
}
}
case 16: {
int16_t *outbuffer = (int16_t *)alac->frame.data[0];
for (i = 0; i < alac->nb_samples; i++) {
*outbuffer++ = alac->output_samples_buffer[0][i];
if (channels == 2)
*outbuffer++ = alac->output_samples_buffer[1][i];
}}
break;
case 24:
if (channels == 2) {
interleave_stereo_24(alac->output_samples_buffer,
(int32_t *)alac->frame.data[0],
alac->nb_samples);
} else {
int32_t *outbuffer = (int32_t *)alac->frame.data[0];
for (i = 0; i < alac->nb_samples; i++)
outbuffer[i] = alac->output_samples_buffer[0][i] << 8;
}
case 24: {
int32_t *outbuffer = (int32_t *)alac->frame.data[0];
for (i = 0; i < alac->nb_samples; i++) {
*outbuffer++ = alac->output_samples_buffer[0][i] << 8;
if (channels == 2)
*outbuffer++ = alac->output_samples_buffer[1][i] << 8;
}}
break;
}