generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Improve xy2 routines slightly

Browse Source 
* Mark MC pointer arguments as restrict

Originally committed as revision 752 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Falk Hüffner 2002-07-13 16:17:38 +00:00
parent 8ed2ddb2c2
commit f5abd9fd1a
1 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
libavcodec/alpha/dsputil_alpha.c
View File

@ -133,6 +133,9 @@ static inline uint64_t avg2(uint64_t a, uint64_t b)
return (a | b) - (((a ^ b) & BYTE_VEC(0xfe)) >> 1); return (a | b) - (((a ^ b) & BYTE_VEC(0xfe)) >> 1);
} }
#if 0
/* The XY2 routines basically utilize this scheme, but reuse parts in
each iteration. */
static inline uint64_t avg4(uint64_t l1, uint64_t l2, uint64_t l3, uint64_t l4) static inline uint64_t avg4(uint64_t l1, uint64_t l2, uint64_t l3, uint64_t l4)
{ {
uint64_t r1 = ((l1 & ~BYTE_VEC(0x03)) >> 2) uint64_t r1 = ((l1 & ~BYTE_VEC(0x03)) >> 2)
@ -146,21 +149,7 @@ static inline uint64_t avg4(uint64_t l1, uint64_t l2, uint64_t l3, uint64_t l4)
+ BYTE_VEC(0x02)) >> 2) & BYTE_VEC(0x03); + BYTE_VEC(0x02)) >> 2) & BYTE_VEC(0x03);
return r1 + r2; return r1 + r2;
} }
#endif
static inline uint64_t avg4_no_rnd(uint64_t l1, uint64_t l2,
uint64_t l3, uint64_t l4)
{
uint64_t r1 = ((l1 & ~BYTE_VEC(0x03)) >> 2)
+ ((l2 & ~BYTE_VEC(0x03)) >> 2)
+ ((l3 & ~BYTE_VEC(0x03)) >> 2)
+ ((l4 & ~BYTE_VEC(0x03)) >> 2);
uint64_t r2 = (( (l1 & BYTE_VEC(0x03))
+ (l2 & BYTE_VEC(0x03))
+ (l3 & BYTE_VEC(0x03))
+ (l4 & BYTE_VEC(0x03))
+ BYTE_VEC(0x01)) >> 2) & BYTE_VEC(0x03);
return r1 + r2;
}
#define OP(LOAD, STORE, INCR) \ #define OP(LOAD, STORE, INCR) \
do { \ do { \
@ -194,36 +183,47 @@ static inline uint64_t avg4_no_rnd(uint64_t l1, uint64_t l2,
} while (--h); \ } while (--h); \
} while (0) } while (0)
#define OP_XY2(LOAD, STORE, INCR) \ #define OP_XY2(LOAD, STORE, INCR) \
do { \ do { \
uint64_t pix1 = LOAD(pixels); \ uint64_t pix1 = LOAD(pixels); \
uint64_t pix2 = pix1 >> 8 | ((uint64_t) pixels[8] << 56); \ uint64_t pix2 = pix1 >> 8 | ((uint64_t) pixels[8] << 56); \
\ uint64_t pix_l = (pix1 & BYTE_VEC(0x03)) \
do { \ + (pix2 & BYTE_VEC(0x03)); \
uint64_t next_pix1, next_pix2; \ uint64_t pix_h = ((pix1 & ~BYTE_VEC(0x03)) >> 2) \
\ + ((pix2 & ~BYTE_VEC(0x03)) >> 2); \
pixels += line_size; \ \
next_pix1 = LOAD(pixels); \ do { \
next_pix2 = next_pix1 >> 8 | ((uint64_t) pixels[8] << 56); \ uint64_t npix1, npix2; \
\ uint64_t npix_l, npix_h; \
STORE(AVG4(pix1, pix2, next_pix1, next_pix2), block); \ uint64_t avg; \
\ \
block += INCR; \ pixels += line_size; \
pix1 = next_pix1; \ npix1 = LOAD(pixels); \
pix2 = next_pix2; \ npix2 = npix1 >> 8 | ((uint64_t) pixels[8] << 56); \
} while (--h); \ npix_l = (npix1 & BYTE_VEC(0x03)) \
+ (npix2 & BYTE_VEC(0x03)); \
npix_h = ((npix1 & ~BYTE_VEC(0x03)) >> 2) \
+ ((npix2 & ~BYTE_VEC(0x03)) >> 2); \
avg = (((pix_l + npix_l + AVG4_ROUNDER) >> 2) & BYTE_VEC(0x03)) \
+ pix_h + npix_h; \
STORE(avg, block); \
\
block += INCR; \
pix_l = npix_l; \
pix_h = npix_h; \
} while (--h); \
} while (0) } while (0)
#define MAKE_OP(BTYPE, OPNAME, SUFF, OPKIND, STORE, INCR) \ #define MAKE_OP(BTYPE, OPNAME, SUFF, OPKIND, STORE, INCR) \
static void OPNAME ## _pixels ## SUFF ## _axp(BTYPE *block, \ static void OPNAME ## _pixels ## SUFF ## _axp \
const uint8_t *pixels, \ (BTYPE *restrict block, const uint8_t *restrict pixels, \
int line_size, int h) \ int line_size, int h) \
{ \ { \
if ((size_t) pixels & 0x7) { \ if ((size_t) pixels & 0x7) { \
OPKIND(uldq, STORE, INCR); \ OPKIND(uldq, STORE, INCR); \
} else { \ } else { \
OPKIND(ldq, STORE, INCR); \ OPKIND(ldq, STORE, INCR); \
} \ } \
} }
#define PIXOP(BTYPE, OPNAME, STORE, INCR) \ #define PIXOP(BTYPE, OPNAME, STORE, INCR) \
@ -235,6 +235,7 @@ static void OPNAME ## _pixels ## SUFF ## _axp(BTYPE *block, \
/* Rounding primitives. */ /* Rounding primitives. */
#define AVG2 avg2 #define AVG2 avg2
#define AVG4 avg4 #define AVG4 avg4
#define AVG4_ROUNDER BYTE_VEC(0x02)
#define STORE(l, b) stq(l, b) #define STORE(l, b) stq(l, b)
PIXOP(uint8_t, put, STORE, line_size); PIXOP(uint8_t, put, STORE, line_size);
@ -245,9 +246,11 @@ PIXOP(uint8_t, avg, STORE, line_size);
/* Not rounding primitives. */ /* Not rounding primitives. */
#undef AVG2 #undef AVG2
#undef AVG4 #undef AVG4
#undef AVG4_ROUNDER
#undef STORE #undef STORE
#define AVG2 avg2_no_rnd #define AVG2 avg2_no_rnd
#define AVG4 avg4_no_rnd #define AVG4 avg4_no_rnd
#define AVG4_ROUNDER BYTE_VEC(0x01)
#define STORE(l, b) stq(l, b) #define STORE(l, b) stq(l, b)
PIXOP(uint8_t, put_no_rnd, STORE, line_size); PIXOP(uint8_t, put_no_rnd, STORE, line_size);