generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

alacdec: rename 2 functions.

Browse Source 
Now they only do stereo interleaving.
This commit is contained in:
Justin Ruggles 2011-10-09 13:31:03 -04:00
parent c39bddd392
commit cb50329fc5
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/alac.c
View File

@ -330,9 +330,9 @@ static void append_extra_bits(int32_t *buffer[MAX_CHANNELS],
buffer[ch][i] = (buffer[ch][i] << extra_bits) | extra_bits_buffer[ch][i]; buffer[ch][i] = (buffer[ch][i] << extra_bits) | extra_bits_buffer[ch][i];
} }
static void reconstruct_stereo_16(int32_t *buffer[MAX_CHANNELS], static void interleave_stereo_16(int32_t *buffer[MAX_CHANNELS],
int16_t *buffer_out, int16_t *buffer_out, int numchannels,
int numchannels, int numsamples) int numsamples)
{ {
int i; int i;
@ -347,9 +347,9 @@ static void reconstruct_stereo_16(int32_t *buffer[MAX_CHANNELS],
} }
} }
static void decorrelate_stereo_24(int32_t *buffer[MAX_CHANNELS], static void interleave_stereo_24(int32_t *buffer[MAX_CHANNELS],
int32_t *buffer_out, int32_t *buffer_out, int numchannels,
int numchannels, int numsamples) int numsamples)
{ {
int i; int i;
@ -534,10 +534,8 @@ static int alac_decode_frame(AVCodecContext *avctx,
switch(alac->setinfo_sample_size) { switch(alac->setinfo_sample_size) {
case 16: case 16:
if (channels == 2) { if (channels == 2) {
reconstruct_stereo_16(alac->outputsamples_buffer, interleave_stereo_16(alac->outputsamples_buffer, outbuffer,
(int16_t*)outbuffer, alac->numchannels, outputsamples);
alac->numchannels,
outputsamples);
} else { } else {
int i; int i;
for (i = 0; i < outputsamples; i++) { for (i = 0; i < outputsamples; i++) {
@ -547,10 +545,8 @@ static int alac_decode_frame(AVCodecContext *avctx,
break; break;
case 24: case 24:
if (channels == 2) { if (channels == 2) {
decorrelate_stereo_24(alac->outputsamples_buffer, interleave_stereo_24(alac->outputsamples_buffer, outbuffer,
outbuffer, alac->numchannels, outputsamples);
alac->numchannels,
outputsamples);
} else { } else {
int i; int i;
for (i = 0; i < outputsamples; i++) for (i = 0; i < outputsamples; i++)