dsputil_template: K&R formatting cosmetics
This commit is contained in:
Diego Biurrun
parent
acd2b8e42d
commit
945673f792
@ -31,8 +31,9 @@
|
||||
|
||||
#if BIT_DEPTH == 8
|
||||
/* draw the edges of width 'w' of an image of size width, height */
|
||||
//FIXME check that this is ok for mpeg4 interlaced
|
||||
static void FUNCC(draw_edges)(uint8_t *_buf, int _wrap, int width, int height, int w, int h, int sides)
|
||||
// FIXME: Check that this is OK for MPEG-4 interlaced.
|
||||
static void FUNCC(draw_edges)(uint8_t *_buf, int _wrap, int width, int height,
|
||||
int w, int h, int sides)
|
||||
{
|
||||
pixel *buf = (pixel *) _buf;
|
||||
int wrap = _wrap / sizeof(pixel);
|
||||
@ -51,15 +52,17 @@ static void FUNCC(draw_edges)(uint8_t *_buf, int _wrap, int width, int height, i
|
||||
last_line = buf + (height - 1) * wrap;
|
||||
if (sides & EDGE_TOP)
|
||||
for (i = 0; i < h; i++)
|
||||
memcpy(buf - (i + 1) * wrap, buf, (width + w + w) * sizeof(pixel)); // top
|
||||
// top
|
||||
memcpy(buf - (i + 1) * wrap, buf, (width + w + w) * sizeof(pixel));
|
||||
if (sides & EDGE_BOTTOM)
|
||||
for (i = 0; i < h; i++)
|
||||
memcpy(last_line + (i + 1) * wrap, last_line, (width + w + w) * sizeof(pixel)); // bottom
|
||||
// bottom
|
||||
memcpy(last_line + (i + 1) * wrap, last_line,
|
||||
(width + w + w) * sizeof(pixel));
|
||||
}
|
||||
#endif
|
||||
|
||||
static void FUNCC(get_pixels)(int16_t *restrict block,
|
||||
const uint8_t *_pixels,
|
||||
static void FUNCC(get_pixels)(int16_t *restrict block, const uint8_t *_pixels,
|
||||
int line_size)
|
||||
{
|
||||
const pixel *pixels = (const pixel *) _pixels;
|
||||
@ -97,144 +100,232 @@ static void FUNCC(clear_blocks)(int16_t *blocks)
|
||||
#endif
|
||||
|
||||
#define PIXOP2(OPNAME, OP) \
|
||||
static inline void FUNC(OPNAME ## _no_rnd_pixels8_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
|
||||
int src_stride1, int src_stride2, int h){\
|
||||
static inline void FUNC(OPNAME ## _no_rnd_pixels8_l2)(uint8_t *dst, \
|
||||
const uint8_t *src1, \
|
||||
const uint8_t *src2, \
|
||||
int dst_stride, \
|
||||
int src_stride1, \
|
||||
int src_stride2, \
|
||||
int h) \
|
||||
{ \
|
||||
int i; \
|
||||
\
|
||||
for (i = 0; i < h; i++) { \
|
||||
pixel4 a, b; \
|
||||
a = AV_RN4P(&src1[i * src_stride1]); \
|
||||
b = AV_RN4P(&src2[i * src_stride2]); \
|
||||
OP(*((pixel4*)&dst[i*dst_stride ]), no_rnd_avg_pixel4(a, b));\
|
||||
OP(*((pixel4 *) &dst[i * dst_stride]), \
|
||||
no_rnd_avg_pixel4(a, b)); \
|
||||
a = AV_RN4P(&src1[i * src_stride1 + 4 * sizeof(pixel)]); \
|
||||
b = AV_RN4P(&src2[i * src_stride2 + 4 * sizeof(pixel)]); \
|
||||
OP(*((pixel4*)&dst[i*dst_stride+4*sizeof(pixel)]), no_rnd_avg_pixel4(a, b));\
|
||||
OP(*((pixel4 *) &dst[i * dst_stride + 4 * sizeof(pixel)]), \
|
||||
no_rnd_avg_pixel4(a, b)); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
static inline void FUNC(OPNAME ## _no_rnd_pixels16_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
|
||||
int src_stride1, int src_stride2, int h){\
|
||||
FUNC(OPNAME ## _no_rnd_pixels8_l2)(dst , src1 , src2 , dst_stride, src_stride1, src_stride2, h);\
|
||||
FUNC(OPNAME ## _no_rnd_pixels8_l2)(dst+8*sizeof(pixel), src1+8*sizeof(pixel), src2+8*sizeof(pixel), dst_stride, src_stride1, src_stride2, h);\
|
||||
static inline void FUNC(OPNAME ## _no_rnd_pixels16_l2)(uint8_t *dst, \
|
||||
const uint8_t *src1, \
|
||||
const uint8_t *src2, \
|
||||
int dst_stride, \
|
||||
int src_stride1, \
|
||||
int src_stride2, \
|
||||
int h) \
|
||||
{ \
|
||||
FUNC(OPNAME ## _no_rnd_pixels8_l2)(dst, src1, src2, dst_stride, \
|
||||
src_stride1, src_stride2, h); \
|
||||
FUNC(OPNAME ## _no_rnd_pixels8_l2)(dst + 8 * sizeof(pixel), \
|
||||
src1 + 8 * sizeof(pixel), \
|
||||
src2 + 8 * sizeof(pixel), \
|
||||
dst_stride, src_stride1, \
|
||||
src_stride2, h); \
|
||||
} \
|
||||
\
|
||||
static inline void FUNC(OPNAME ## _pixels8_l4)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, const uint8_t *src4,\
|
||||
int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
|
||||
static inline void FUNC(OPNAME ## _pixels8_l4)(uint8_t *dst, \
|
||||
const uint8_t *src1, \
|
||||
const uint8_t *src2, \
|
||||
const uint8_t *src3, \
|
||||
const uint8_t *src4, \
|
||||
int dst_stride, \
|
||||
int src_stride1, \
|
||||
int src_stride2, \
|
||||
int src_stride3, \
|
||||
int src_stride4, \
|
||||
int h) \
|
||||
{ \
|
||||
/* FIXME HIGH BIT DEPTH */ \
|
||||
int i; \
|
||||
\
|
||||
for (i = 0; i < h; i++) { \
|
||||
uint32_t a, b, c, d, l0, l1, h0, h1; \
|
||||
a = AV_RN32(&src1[i * src_stride1]); \
|
||||
b = AV_RN32(&src2[i * src_stride2]); \
|
||||
c = AV_RN32(&src3[i * src_stride3]); \
|
||||
d = AV_RN32(&src4[i * src_stride4]); \
|
||||
l0= (a&0x03030303UL)\
|
||||
+ (b&0x03030303UL)\
|
||||
+ 0x02020202UL;\
|
||||
h0= ((a&0xFCFCFCFCUL)>>2)\
|
||||
+ ((b&0xFCFCFCFCUL)>>2);\
|
||||
l1= (c&0x03030303UL)\
|
||||
+ (d&0x03030303UL);\
|
||||
h1= ((c&0xFCFCFCFCUL)>>2)\
|
||||
+ ((d&0xFCFCFCFCUL)>>2);\
|
||||
OP(*((uint32_t*)&dst[i*dst_stride]), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
|
||||
l0 = (a & 0x03030303UL) + \
|
||||
(b & 0x03030303UL) + \
|
||||
0x02020202UL; \
|
||||
h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
|
||||
((b & 0xFCFCFCFCUL) >> 2); \
|
||||
l1 = (c & 0x03030303UL) + \
|
||||
(d & 0x03030303UL); \
|
||||
h1 = ((c & 0xFCFCFCFCUL) >> 2) + \
|
||||
((d & 0xFCFCFCFCUL) >> 2); \
|
||||
OP(*((uint32_t *) &dst[i * dst_stride]), \
|
||||
h0 + h1 + (((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
|
||||
a = AV_RN32(&src1[i * src_stride1 + 4]); \
|
||||
b = AV_RN32(&src2[i * src_stride2 + 4]); \
|
||||
c = AV_RN32(&src3[i * src_stride3 + 4]); \
|
||||
d = AV_RN32(&src4[i * src_stride4 + 4]); \
|
||||
l0= (a&0x03030303UL)\
|
||||
+ (b&0x03030303UL)\
|
||||
+ 0x02020202UL;\
|
||||
h0= ((a&0xFCFCFCFCUL)>>2)\
|
||||
+ ((b&0xFCFCFCFCUL)>>2);\
|
||||
l1= (c&0x03030303UL)\
|
||||
+ (d&0x03030303UL);\
|
||||
h1= ((c&0xFCFCFCFCUL)>>2)\
|
||||
+ ((d&0xFCFCFCFCUL)>>2);\
|
||||
OP(*((uint32_t*)&dst[i*dst_stride+4]), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
|
||||
l0 = (a & 0x03030303UL) + \
|
||||
(b & 0x03030303UL) + \
|
||||
0x02020202UL; \
|
||||
h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
|
||||
((b & 0xFCFCFCFCUL) >> 2); \
|
||||
l1 = (c & 0x03030303UL) + \
|
||||
(d & 0x03030303UL); \
|
||||
h1 = ((c & 0xFCFCFCFCUL) >> 2) + \
|
||||
((d & 0xFCFCFCFCUL) >> 2); \
|
||||
OP(*((uint32_t *) &dst[i * dst_stride + 4]), \
|
||||
h0 + h1 + (((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
static inline void FUNC(OPNAME ## _no_rnd_pixels8_l4)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, const uint8_t *src4,\
|
||||
int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
|
||||
static inline void FUNC(OPNAME ## _no_rnd_pixels8_l4)(uint8_t *dst, \
|
||||
const uint8_t *src1, \
|
||||
const uint8_t *src2, \
|
||||
const uint8_t *src3, \
|
||||
const uint8_t *src4, \
|
||||
int dst_stride, \
|
||||
int src_stride1, \
|
||||
int src_stride2, \
|
||||
int src_stride3, \
|
||||
int src_stride4, \
|
||||
int h) \
|
||||
{ \
|
||||
/* FIXME HIGH BIT DEPTH */ \
|
||||
int i; \
|
||||
\
|
||||
for (i = 0; i < h; i++) { \
|
||||
uint32_t a, b, c, d, l0, l1, h0, h1; \
|
||||
a = AV_RN32(&src1[i * src_stride1]); \
|
||||
b = AV_RN32(&src2[i * src_stride2]); \
|
||||
c = AV_RN32(&src3[i * src_stride3]); \
|
||||
d = AV_RN32(&src4[i * src_stride4]); \
|
||||
l0= (a&0x03030303UL)\
|
||||
+ (b&0x03030303UL)\
|
||||
+ 0x01010101UL;\
|
||||
h0= ((a&0xFCFCFCFCUL)>>2)\
|
||||
+ ((b&0xFCFCFCFCUL)>>2);\
|
||||
l1= (c&0x03030303UL)\
|
||||
+ (d&0x03030303UL);\
|
||||
h1= ((c&0xFCFCFCFCUL)>>2)\
|
||||
+ ((d&0xFCFCFCFCUL)>>2);\
|
||||
OP(*((uint32_t*)&dst[i*dst_stride]), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
|
||||
l0 = (a & 0x03030303UL) + \
|
||||
(b & 0x03030303UL) + \
|
||||
0x01010101UL; \
|
||||
h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
|
||||
((b & 0xFCFCFCFCUL) >> 2); \
|
||||
l1 = (c & 0x03030303UL) + \
|
||||
(d & 0x03030303UL); \
|
||||
h1 = ((c & 0xFCFCFCFCUL) >> 2) + \
|
||||
((d & 0xFCFCFCFCUL) >> 2); \
|
||||
OP(*((uint32_t *) &dst[i * dst_stride]), \
|
||||
h0 + h1 + (((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
|
||||
a = AV_RN32(&src1[i * src_stride1 + 4]); \
|
||||
b = AV_RN32(&src2[i * src_stride2 + 4]); \
|
||||
c = AV_RN32(&src3[i * src_stride3 + 4]); \
|
||||
d = AV_RN32(&src4[i * src_stride4 + 4]); \
|
||||
l0= (a&0x03030303UL)\
|
||||
+ (b&0x03030303UL)\
|
||||
+ 0x01010101UL;\
|
||||
h0= ((a&0xFCFCFCFCUL)>>2)\
|
||||
+ ((b&0xFCFCFCFCUL)>>2);\
|
||||
l1= (c&0x03030303UL)\
|
||||
+ (d&0x03030303UL);\
|
||||
h1= ((c&0xFCFCFCFCUL)>>2)\
|
||||
+ ((d&0xFCFCFCFCUL)>>2);\
|
||||
OP(*((uint32_t*)&dst[i*dst_stride+4]), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
|
||||
l0 = (a & 0x03030303UL) + \
|
||||
(b & 0x03030303UL) + \
|
||||
0x01010101UL; \
|
||||
h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
|
||||
((b & 0xFCFCFCFCUL) >> 2); \
|
||||
l1 = (c & 0x03030303UL) + \
|
||||
(d & 0x03030303UL); \
|
||||
h1 = ((c & 0xFCFCFCFCUL) >> 2) + \
|
||||
((d & 0xFCFCFCFCUL) >> 2); \
|
||||
OP(*((uint32_t *) &dst[i * dst_stride + 4]), \
|
||||
h0 + h1 + (((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
|
||||
} \
|
||||
} \
|
||||
static inline void FUNC(OPNAME ## _pixels16_l4)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, const uint8_t *src4,\
|
||||
int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
|
||||
FUNC(OPNAME ## _pixels8_l4)(dst , src1 , src2 , src3 , src4 , dst_stride, src_stride1, src_stride2, src_stride3, src_stride4, h);\
|
||||
FUNC(OPNAME ## _pixels8_l4)(dst+8*sizeof(pixel), src1+8*sizeof(pixel), src2+8*sizeof(pixel), src3+8*sizeof(pixel), src4+8*sizeof(pixel), dst_stride, src_stride1, src_stride2, src_stride3, src_stride4, h);\
|
||||
static inline void FUNC(OPNAME ## _pixels16_l4)(uint8_t *dst, \
|
||||
const uint8_t *src1, \
|
||||
const uint8_t *src2, \
|
||||
const uint8_t *src3, \
|
||||
const uint8_t *src4, \
|
||||
int dst_stride, \
|
||||
int src_stride1, \
|
||||
int src_stride2, \
|
||||
int src_stride3, \
|
||||
int src_stride4, \
|
||||
int h) \
|
||||
{ \
|
||||
FUNC(OPNAME ## _pixels8_l4)(dst, src1, src2, src3, src4, dst_stride, \
|
||||
src_stride1, src_stride2, src_stride3, \
|
||||
src_stride4, h); \
|
||||
FUNC(OPNAME ## _pixels8_l4)(dst + 8 * sizeof(pixel), \
|
||||
src1 + 8 * sizeof(pixel), \
|
||||
src2 + 8 * sizeof(pixel), \
|
||||
src3 + 8 * sizeof(pixel), \
|
||||
src4 + 8 * sizeof(pixel), \
|
||||
dst_stride, src_stride1, src_stride2, \
|
||||
src_stride3, src_stride4, h); \
|
||||
} \
|
||||
static inline void FUNC(OPNAME ## _no_rnd_pixels16_l4)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, const uint8_t *src4,\
|
||||
int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
|
||||
FUNC(OPNAME ## _no_rnd_pixels8_l4)(dst , src1 , src2 , src3 , src4 , dst_stride, src_stride1, src_stride2, src_stride3, src_stride4, h);\
|
||||
FUNC(OPNAME ## _no_rnd_pixels8_l4)(dst+8*sizeof(pixel), src1+8*sizeof(pixel), src2+8*sizeof(pixel), src3+8*sizeof(pixel), src4+8*sizeof(pixel), dst_stride, src_stride1, src_stride2, src_stride3, src_stride4, h);\
|
||||
static inline void FUNC(OPNAME ## _no_rnd_pixels16_l4)(uint8_t *dst, \
|
||||
const uint8_t *src1, \
|
||||
const uint8_t *src2, \
|
||||
const uint8_t *src3, \
|
||||
const uint8_t *src4, \
|
||||
int dst_stride, \
|
||||
int src_stride1, \
|
||||
int src_stride2, \
|
||||
int src_stride3, \
|
||||
int src_stride4, \
|
||||
int h) \
|
||||
{ \
|
||||
FUNC(OPNAME ## _no_rnd_pixels8_l4)(dst, src1, src2, src3, src4, \
|
||||
dst_stride, src_stride1, src_stride2, \
|
||||
src_stride3, src_stride4, h); \
|
||||
FUNC(OPNAME ## _no_rnd_pixels8_l4)(dst + 8 * sizeof(pixel), \
|
||||
src1 + 8 * sizeof(pixel), \
|
||||
src2 + 8 * sizeof(pixel), \
|
||||
src3 + 8 * sizeof(pixel), \
|
||||
src4 + 8 * sizeof(pixel), \
|
||||
dst_stride, src_stride1, src_stride2, \
|
||||
src_stride3, src_stride4, h); \
|
||||
} \
|
||||
\
|
||||
static inline void FUNCC(OPNAME ## _pixels8_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)\
|
||||
static inline void FUNCC(OPNAME ## _pixels8_xy2)(uint8_t *block, \
|
||||
const uint8_t *pixels, \
|
||||
ptrdiff_t line_size, \
|
||||
int h) \
|
||||
{ \
|
||||
/* FIXME HIGH BIT DEPTH */ \
|
||||
int j; \
|
||||
\
|
||||
for (j = 0; j < 2; j++) { \
|
||||
int i; \
|
||||
const uint32_t a = AV_RN32(pixels); \
|
||||
const uint32_t b = AV_RN32(pixels + 1); \
|
||||
uint32_t l0= (a&0x03030303UL)\
|
||||
+ (b&0x03030303UL)\
|
||||
+ 0x02020202UL;\
|
||||
uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\
|
||||
+ ((b&0xFCFCFCFCUL)>>2);\
|
||||
uint32_t l0 = (a & 0x03030303UL) + \
|
||||
(b & 0x03030303UL) + \
|
||||
0x02020202UL; \
|
||||
uint32_t h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
|
||||
((b & 0xFCFCFCFCUL) >> 2); \
|
||||
uint32_t l1, h1; \
|
||||
\
|
||||
pixels += line_size; \
|
||||
for (i = 0; i < h; i += 2) { \
|
||||
uint32_t a = AV_RN32(pixels); \
|
||||
uint32_t b = AV_RN32(pixels + 1); \
|
||||
l1= (a&0x03030303UL)\
|
||||
+ (b&0x03030303UL);\
|
||||
h1= ((a&0xFCFCFCFCUL)>>2)\
|
||||
+ ((b&0xFCFCFCFCUL)>>2);\
|
||||
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
|
||||
l1 = (a & 0x03030303UL) + \
|
||||
(b & 0x03030303UL); \
|
||||
h1 = ((a & 0xFCFCFCFCUL) >> 2) + \
|
||||
((b & 0xFCFCFCFCUL) >> 2); \
|
||||
OP(*((uint32_t *) block), \
|
||||
h0 + h1 + (((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
|
||||
pixels += line_size; \
|
||||
block += line_size; \
|
||||
a = AV_RN32(pixels); \
|
||||
b = AV_RN32(pixels + 1); \
|
||||
l0= (a&0x03030303UL)\
|
||||
+ (b&0x03030303UL)\
|
||||
+ 0x02020202UL;\
|
||||
h0= ((a&0xFCFCFCFCUL)>>2)\
|
||||
+ ((b&0xFCFCFCFCUL)>>2);\
|
||||
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
|
||||
l0 = (a & 0x03030303UL) + \
|
||||
(b & 0x03030303UL) + \
|
||||
0x02020202UL; \
|
||||
h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
|
||||
((b & 0xFCFCFCFCUL) >> 2); \
|
||||
OP(*((uint32_t *) block), \
|
||||
h0 + h1 + (((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
|
||||
pixels += line_size; \
|
||||
block += line_size; \
|
||||
} \
|
||||
@ -243,7 +334,9 @@ static inline void FUNCC(OPNAME ## _pixels8_xy2)(uint8_t *block, const uint8_t *
|
||||
} \
|
||||
} \
|
||||
\
|
||||
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_xy2), FUNCC(OPNAME ## _pixels8_xy2), 8*sizeof(pixel))\
|
||||
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_xy2), \
|
||||
FUNCC(OPNAME ## _pixels8_xy2), \
|
||||
8 * sizeof(pixel)) \
|
||||
|
||||
#define op_avg(a, b) a = rnd_avg_pixel4(a, b)
|
||||
#define op_put(a, b) a = b
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user