diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-09 13:31:03 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-26 11:50:16 -0400 |
| commit | cb50329fc5ea89240ea5e835a3ee72ce16cf052a (patch) | |
| tree | a1958eca440c71c3eb73748aa42c4d1d655fb975 /libavcodec/alac.c | |
| parent | c39bddd392f4fe79e038f5753ac10abb78dedeb8 (diff) | |
| download | ffmpeg-cb50329fc5ea89240ea5e835a3ee72ce16cf052a.tar.gz | |
alacdec: rename 2 functions.
Now they only do stereo interleaving.
Diffstat (limited to 'libavcodec/alac.c')
| -rw-r--r-- | libavcodec/alac.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index b7071d2a15..6563e52f30 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -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]; } -static void reconstruct_stereo_16(int32_t *buffer[MAX_CHANNELS], - int16_t *buffer_out, - int numchannels, int numsamples) +static void interleave_stereo_16(int32_t *buffer[MAX_CHANNELS], + int16_t *buffer_out, int numchannels, + int numsamples) { 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], - int32_t *buffer_out, - int numchannels, int numsamples) +static void interleave_stereo_24(int32_t *buffer[MAX_CHANNELS], + int32_t *buffer_out, int numchannels, + int numsamples) { int i; @@ -534,10 +534,8 @@ static int alac_decode_frame(AVCodecContext *avctx, switch(alac->setinfo_sample_size) { case 16: if (channels == 2) { - reconstruct_stereo_16(alac->outputsamples_buffer, - (int16_t*)outbuffer, - alac->numchannels, - outputsamples); + interleave_stereo_16(alac->outputsamples_buffer, outbuffer, + alac->numchannels, outputsamples); } else { int i; for (i = 0; i < outputsamples; i++) { @@ -547,10 +545,8 @@ static int alac_decode_frame(AVCodecContext *avctx, break; case 24: if (channels == 2) { - decorrelate_stereo_24(alac->outputsamples_buffer, - outbuffer, - alac->numchannels, - outputsamples); + interleave_stereo_24(alac->outputsamples_buffer, outbuffer, + alac->numchannels, outputsamples); } else { int i; for (i = 0; i < outputsamples; i++) |