virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Replace some hardcoded swapping with FFSWAP.

Browse Source 
Patch by Vitor Sessak (vitor1001 gmail com)

Originally committed as revision 13123 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-05-11 18:43:11 +00:00 committed by Alexander Strange
parent cd780422e1
commit 0d493edd0b
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/ra144.c
View File

@ -108,7 +108,7 @@ static void do_voice(int *a1, int *a2)
int buffer[10]; int buffer[10];
int *b1, *b2; int *b1, *b2;
int x, y; int x, y;
int *ptr, *tmp; int *ptr;
b1 = buffer; b1 = buffer;
b2 = a2; b2 = a2;
@ -121,9 +121,7 @@ static void do_voice(int *a1, int *a2)
for (y=0; y <= x - 1; y++) for (y=0; y <= x - 1; y++)
b1[y] = (((*a1) * (*(--ptr))) >> 12) + b2[y]; b1[y] = (((*a1) * (*(--ptr))) >> 12) + b2[y];
} }
tmp = b1; FFSWAP(int *, b1, b2);
b1 = b2;
b2 = tmp;
a1++; a1++;
} }
ptr = a2 + 10; ptr = a2 + 10;
@ -359,7 +357,7 @@ static int eq(Real144_internal *glob, short *in, int *target)
unsigned int u; unsigned int u;
short *sptr; short *sptr;
int *ptr1, *ptr2, *ptr3; int *ptr1, *ptr2, *ptr3;
int *bp1, *bp2, *temp; int *bp1, *bp2;
retval = 0; retval = 0;
bp1 = glob->buffer1; bp1 = glob->buffer1;
@ -403,9 +401,7 @@ static int eq(Real144_internal *glob, short *in, int *target)
if ((u + 0x1000) > 0x1fff) if ((u + 0x1000) > 0x1fff)
retval = 1; retval = 1;
temp = bp2; FFSWAP(unsigned int *, bp1, bp2);
bp2 = bp1;
bp1 = temp;
} }
return retval; return retval;
} }
@ -454,7 +450,7 @@ static int ra144_decode_frame(AVCodecContext * avctx,
{ {
unsigned int a, b, c; unsigned int a, b, c;
signed short *shptr; signed short *shptr;
unsigned int *lptr, *temp; unsigned int *lptr;
const short **dptr; const short **dptr;
int16_t *datao; int16_t *datao;
int16_t *data = vdata; int16_t *data = vdata;
@ -513,12 +509,10 @@ static int ra144_decode_frame(AVCodecContext * avctx,
} }
glob->oldval = glob->val; glob->oldval = glob->val;
temp = glob->swapbuf1alt;
glob->swapbuf1alt = glob->swapbuf1; FFSWAP(unsigned int *, glob->swapbuf1alt, glob->swapbuf1);
glob->swapbuf1 = temp; FFSWAP(unsigned int *, glob->swapbuf2alt, glob->swapbuf2);
temp = glob->swapbuf2alt;
glob->swapbuf2alt = glob->swapbuf2;
glob->swapbuf2 = temp;
*data_size = (data-datao)*sizeof(*data); *data_size = (data-datao)*sizeof(*data);
return 20; return 20;
} }