har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make deinterlace_16 receive an array as a parameter and not two separated vars

Browse Source 
Originally committed as revision 9739 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2007-07-18 14:45:01 +00:00
parent b37bce6b61
commit c9128d569a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/alac.c
View File

@ -399,7 +399,7 @@ static void predictor_decompress_fir_adapt(int32_t *error_buffer,
} }
} }
static void deinterlace_16(int32_t *buffer_a, int32_t *buffer_b, static void deinterlace_16(int32_t *buffer[MAX_CHANNELS],
int16_t *buffer_out, int16_t *buffer_out,
int numchannels, int numsamples, int numchannels, int numsamples,
uint8_t interlacing_shift, uint8_t interlacing_shift,
@ -416,8 +416,8 @@ static void deinterlace_16(int32_t *buffer_a, int32_t *buffer_b,
int16_t left; int16_t left;
int16_t right; int16_t right;
midright = buffer_a[i]; midright = buffer[0][i];
difference = buffer_b[i]; difference = buffer[1][i];
right = midright - ((difference * interlacing_leftweight) >> interlacing_shift); right = midright - ((difference * interlacing_leftweight) >> interlacing_shift);
@ -434,8 +434,8 @@ static void deinterlace_16(int32_t *buffer_a, int32_t *buffer_b,
for (i = 0; i < numsamples; i++) { for (i = 0; i < numsamples; i++) {
int16_t left, right; int16_t left, right;
left = buffer_a[i]; left = buffer[0][i];
right = buffer_b[i]; right = buffer[1][i];
buffer_out[i*numchannels] = left; buffer_out[i*numchannels] = left;
buffer_out[i*numchannels + 1] = right; buffer_out[i*numchannels + 1] = right;
@ -602,8 +602,7 @@ 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) {
deinterlace_16(alac->outputsamples_buffer[0], deinterlace_16(alac->outputsamples_buffer,
alac->outputsamples_buffer[1],
(int16_t*)outbuffer, (int16_t*)outbuffer,
alac->numchannels, alac->numchannels,
outputsamples, outputsamples,