diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-01-10 00:51:45 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-01-10 00:51:45 +0000 |
| commit | 5a2408385979a543dd86752fafe5724fd8fbbaf4 (patch) | |
| tree | d3ab138d85ee6885d5fbb7435001f3c1603511c9 /libavcodec/dsputil.h | |
| parent | ef093645ef508f755ac80ef62cf774e376fe1eb8 (diff) | |
| download | ffmpeg-5a2408385979a543dd86752fafe5724fd8fbbaf4.tar.gz | |
fix for non-mmx runtimedetect encoding bugs - patch by Michael Niedermayer <michaelni@gmx.at>
Originally committed as revision 250 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 12f0e3f2bb..9ebf2f5124 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -19,6 +19,9 @@ extern UINT8 ff_alternate_horizontal_scan[64]; extern UINT8 ff_alternate_vertical_scan[64]; extern UINT8 zigzag_direct[64]; +/* permutation table */ +extern UINT8 permutation[64]; + /* pixel operations */ #define MAX_NEG_CROP 384 @@ -67,33 +70,10 @@ int pix_abs16x16_x2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); int pix_abs16x16_y2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); int pix_abs16x16_xy2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); -#if defined (SIMPLE_IDCT) && defined (HAVE_MMX) static inline int block_permute_op(int j) { -static const int table[64]={ - 0x00, 0x08, 0x01, 0x09, 0x04, 0x0C, 0x05, 0x0D, - 0x10, 0x18, 0x11, 0x19, 0x14, 0x1C, 0x15, 0x1D, - 0x02, 0x0A, 0x03, 0x0B, 0x06, 0x0E, 0x07, 0x0F, - 0x12, 0x1A, 0x13, 0x1B, 0x16, 0x1E, 0x17, 0x1F, - 0x20, 0x28, 0x21, 0x29, 0x24, 0x2C, 0x25, 0x2D, - 0x30, 0x38, 0x31, 0x39, 0x34, 0x3C, 0x35, 0x3D, - 0x22, 0x2A, 0x23, 0x2B, 0x26, 0x2E, 0x27, 0x2F, - 0x32, 0x3A, 0x33, 0x3B, 0x36, 0x3E, 0x37, 0x3F, -}; - - return table[j]; + return permutation[j]; } -#elif defined (SIMPLE_IDCT) -static inline int block_permute_op(int j) -{ - return j; -} -#else -static inline int block_permute_op(int j) -{ - return (j & 0x38) | ((j & 6) >> 1) | ((j & 1) << 2); -} -#endif void block_permute(INT16 *block); |