diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-05-17 13:01:01 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-05-17 13:01:01 +0000 |
| commit | a7bd879798eb9b87c9558805b023082b9967fe1a (patch) | |
| tree | 9c8ac8ed62de86f883c6c766c085d326728e6eb0 /libavcodec/i386 | |
| parent | 96c7b5356144d09ab42db283d5cfc1083d44395b (diff) | |
| download | ffmpeg-a7bd879798eb9b87c9558805b023082b9967fe1a.tar.gz | |
shared lib support (req by kabi) ...
Originally committed as revision 510 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/i386')
| -rw-r--r-- | libavcodec/i386/dsputil_mmx.c | 13 | ||||
| -rw-r--r-- | libavcodec/i386/dsputil_mmx_avg.h | 8 |
2 files changed, 14 insertions, 7 deletions
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c index d01e6afcd7..1354e188b6 100644 --- a/libavcodec/i386/dsputil_mmx.c +++ b/libavcodec/i386/dsputil_mmx.c @@ -50,9 +50,9 @@ void ff_mmx_idct(DCTELEM *block); void ff_mmxext_idct(DCTELEM *block); /* pixel operations */ -static const unsigned long long int mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101LL; -static const unsigned long long int mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001LL; -static const unsigned long long int mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002LL; +static const uint64_t mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101ULL; +static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL; +static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL; //static const unsigned short mm_wone[4] __attribute__ ((aligned(8))) = { 0x1, 0x1, 0x1, 0x1 }; //static const unsigned short mm_wtwo[4] __attribute__ ((aligned(8))) = { 0x2, 0x2, 0x2, 0x2 }; @@ -62,6 +62,7 @@ static const unsigned long long int mm_wtwo __attribute__ ((aligned(8))) = 0x000 #ifndef PIC #define MOVQ_WONE(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_wone)) #define MOVQ_WTWO(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_wtwo)) +#define MOVQ_BONE(regd) "movq "MANGLE(mm_bone)", "#regd" \n\t" #else // for shared library it's better to use this way for accessing constants // pcmpeqd -> -1 @@ -75,8 +76,14 @@ static const unsigned long long int mm_wtwo __attribute__ ((aligned(8))) = 0x000 "pcmpeqd %%" #regd ", %%" #regd " \n\t" \ "psrlw $15, %%" #regd " \n\t" \ "psllw $1, %%" #regd ::) + +#define MOVQ_BONE(regd) \ + "pcmpeqd " #regd ", " #regd " \n\t" \ + "psrlw $15, " #regd " \n\t"\ + "packuswb " #regd ", " #regd " \n\t" #endif + /***********************************/ /* 3Dnow specific */ diff --git a/libavcodec/i386/dsputil_mmx_avg.h b/libavcodec/i386/dsputil_mmx_avg.h index df773b72a0..78ed4040f5 100644 --- a/libavcodec/i386/dsputil_mmx_avg.h +++ b/libavcodec/i386/dsputil_mmx_avg.h @@ -20,7 +20,7 @@ * MMX optimization by Nick Kurshev <nickols_k@mail.ru> * mostly rewritten by Michael Niedermayer <michaelni@gmx.at> */ - + static void DEF(put_pixels_x2)(UINT8 *block, const UINT8 *pixels, int line_size, int h) { __asm __volatile( @@ -57,7 +57,7 @@ static void DEF(put_no_rnd_pixels_x2)(UINT8 *block, const UINT8 *pixels, int lin { __asm __volatile( "xorl %%eax, %%eax \n\t" - "movq "MANGLE(mm_bone)", %%mm7 \n\t" + MOVQ_BONE(%%mm7) ".balign 16 \n\t" "1: \n\t" "movq (%1, %%eax), %%mm0 \n\t" @@ -122,7 +122,7 @@ static void DEF(put_pixels_y2)(UINT8 *block, const UINT8 *pixels, int line_size, static void DEF(put_no_rnd_pixels_y2)(UINT8 *block, const UINT8 *pixels, int line_size, int h) { __asm __volatile( - "movq "MANGLE(mm_bone)", %%mm7 \n\t" + MOVQ_BONE(%%mm7) "xorl %%eax, %%eax \n\t" "movq (%1), %%mm0 \n\t" ".balign 16 \n\t" @@ -264,7 +264,7 @@ static void DEF(avg_pixels_y2)(UINT8 *block, const UINT8 *pixels, int line_size, static void DEF(avg_pixels_xy2)(UINT8 *block, const UINT8 *pixels, int line_size, int h) { __asm __volatile( - "movq "MANGLE(mm_bone)", %%mm7 \n\t" + MOVQ_BONE(%%mm7) "xorl %%eax, %%eax \n\t" "movq (%1), %%mm0 \n\t" "movq 1(%1), %%mm1 \n\t" |