comparison dsputil.h @ 190:9e0e56869d05 libavcodec

fix for non-mmx runtimedetect encoding bugs - patch by Michael Niedermayer <michaelni@gmx.at>
author uid46427
date Thu, 10 Jan 2002 00:51:45 +0000
parents ac5075a55488
children 73df666cacc7
comparison
equal deleted inserted replaced
189:42552c1cf360 190:9e0e56869d05
16 16
17 /* encoding scans */ 17 /* encoding scans */
18 extern UINT8 ff_alternate_horizontal_scan[64]; 18 extern UINT8 ff_alternate_horizontal_scan[64];
19 extern UINT8 ff_alternate_vertical_scan[64]; 19 extern UINT8 ff_alternate_vertical_scan[64];
20 extern UINT8 zigzag_direct[64]; 20 extern UINT8 zigzag_direct[64];
21
22 /* permutation table */
23 extern UINT8 permutation[64];
21 24
22 /* pixel operations */ 25 /* pixel operations */
23 #define MAX_NEG_CROP 384 26 #define MAX_NEG_CROP 384
24 27
25 /* temporary */ 28 /* temporary */
65 int pix_abs16x16_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); 68 int pix_abs16x16_c(UINT8 *blk1, UINT8 *blk2, int lx, int h);
66 int pix_abs16x16_x2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); 69 int pix_abs16x16_x2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h);
67 int pix_abs16x16_y2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); 70 int pix_abs16x16_y2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h);
68 int pix_abs16x16_xy2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h); 71 int pix_abs16x16_xy2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h);
69 72
70 #if defined (SIMPLE_IDCT) && defined (HAVE_MMX)
71 static inline int block_permute_op(int j) 73 static inline int block_permute_op(int j)
72 { 74 {
73 static const int table[64]={ 75 return permutation[j];
74 0x00, 0x08, 0x01, 0x09, 0x04, 0x0C, 0x05, 0x0D,
75 0x10, 0x18, 0x11, 0x19, 0x14, 0x1C, 0x15, 0x1D,
76 0x02, 0x0A, 0x03, 0x0B, 0x06, 0x0E, 0x07, 0x0F,
77 0x12, 0x1A, 0x13, 0x1B, 0x16, 0x1E, 0x17, 0x1F,
78 0x20, 0x28, 0x21, 0x29, 0x24, 0x2C, 0x25, 0x2D,
79 0x30, 0x38, 0x31, 0x39, 0x34, 0x3C, 0x35, 0x3D,
80 0x22, 0x2A, 0x23, 0x2B, 0x26, 0x2E, 0x27, 0x2F,
81 0x32, 0x3A, 0x33, 0x3B, 0x36, 0x3E, 0x37, 0x3F,
82 };
83
84 return table[j];
85 } 76 }
86 #elif defined (SIMPLE_IDCT)
87 static inline int block_permute_op(int j)
88 {
89 return j;
90 }
91 #else
92 static inline int block_permute_op(int j)
93 {
94 return (j & 0x38) | ((j & 6) >> 1) | ((j & 1) << 2);
95 }
96 #endif
97 77
98 void block_permute(INT16 *block); 78 void block_permute(INT16 *block);
99 79
100 #if defined(HAVE_MMX) 80 #if defined(HAVE_MMX)
101 81