hpel_template: K&R formatting cosmetics

This commit is contained in:
Diego Biurrun 2014-01-10 12:11:04 +01:00
parent 6a74ebc34d
commit e8eace3276

View File

@ -20,7 +20,11 @@
*/ */
#define DEF_HPEL(OPNAME, OP) \ #define DEF_HPEL(OPNAME, OP) \
static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block, \
const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \
int i; \ int i; \
for (i = 0; i < h; i++) { \ for (i = 0; i < h; i++) { \
OP(*((pixel2 *) (block)), AV_RN2P(pixels)); \ OP(*((pixel2 *) (block)), AV_RN2P(pixels)); \
@ -28,7 +32,12 @@ static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block, const uint8_t *pixe
block += line_size; \ block += line_size; \
} \ } \
} \ } \
static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ \
static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block, \
const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \
int i; \ int i; \
for (i = 0; i < h; i++) { \ for (i = 0; i < h; i++) { \
OP(*((pixel4 *) (block)), AV_RN4P(pixels)); \ OP(*((pixel4 *) (block)), AV_RN4P(pixels)); \
@ -36,18 +45,30 @@ static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block, const uint8_t *pixe
block += line_size; \ block += line_size; \
} \ } \
} \ } \
static inline void FUNCC(OPNAME ## _pixels8)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
int i;\
for(i=0; i<h; i++){\
OP(*((pixel4*)(block )), AV_RN4P(pixels ));\
OP(*((pixel4*)(block+4*sizeof(pixel))), AV_RN4P(pixels+4*sizeof(pixel)));\
pixels+=line_size;\
block +=line_size;\
}\
}\
\ \
static inline void FUNC(OPNAME ## _pixels8_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \ static inline void FUNCC(OPNAME ## _pixels8)(uint8_t *block, \
int src_stride1, int src_stride2, int h){\ const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \
int i; \
for (i = 0; i < h; i++) { \
OP(*((pixel4 *) (block)), AV_RN4P(pixels)); \
OP(*((pixel4 *) (block + 4 * sizeof(pixel))), \
AV_RN4P(pixels + 4 * sizeof(pixel))); \
pixels += line_size; \
block += line_size; \
} \
} \
\
static inline void FUNC(OPNAME ## _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; \ int i; \
for (i = 0; i < h; i++) { \ for (i = 0; i < h; i++) { \
pixel4 a, b; \ pixel4 a, b; \
@ -56,12 +77,19 @@ static inline void FUNC(OPNAME ## _pixels8_l2)(uint8_t *dst, const uint8_t *src1
OP(*((pixel4 *) &dst[i * dst_stride]), rnd_avg_pixel4(a, b)); \ OP(*((pixel4 *) &dst[i * dst_stride]), rnd_avg_pixel4(a, b)); \
a = AV_RN4P(&src1[i * src_stride1 + 4 * sizeof(pixel)]); \ a = AV_RN4P(&src1[i * src_stride1 + 4 * sizeof(pixel)]); \
b = AV_RN4P(&src2[i * src_stride2 + 4 * sizeof(pixel)]); \ b = AV_RN4P(&src2[i * src_stride2 + 4 * sizeof(pixel)]); \
OP(*((pixel4*)&dst[i*dst_stride+4*sizeof(pixel)]), rnd_avg_pixel4(a, b));\ OP(*((pixel4 *) &dst[i * dst_stride + 4 * sizeof(pixel)]), \
rnd_avg_pixel4(a, b)); \
} \ } \
} \ } \
\ \
static inline void FUNC(OPNAME ## _pixels4_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \ static inline void FUNC(OPNAME ## _pixels4_l2)(uint8_t *dst, \
int src_stride1, int src_stride2, int h){\ const uint8_t *src1, \
const uint8_t *src2, \
int dst_stride, \
int src_stride1, \
int src_stride2, \
int h) \
{ \
int i; \ int i; \
for (i = 0; i < h; i++) { \ for (i = 0; i < h; i++) { \
pixel4 a, b; \ pixel4 a, b; \
@ -71,8 +99,14 @@ static inline void FUNC(OPNAME ## _pixels4_l2)(uint8_t *dst, const uint8_t *src1
} \ } \
} \ } \
\ \
static inline void FUNC(OPNAME ## _pixels2_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \ static inline void FUNC(OPNAME ## _pixels2_l2)(uint8_t *dst, \
int src_stride1, int src_stride2, int h){\ const uint8_t *src1, \
const uint8_t *src2, \
int dst_stride, \
int src_stride1, \
int src_stride2, \
int h) \
{ \
int i; \ int i; \
for (i = 0; i < h; i++) { \ for (i = 0; i < h; i++) { \
pixel4 a, b; \ pixel4 a, b; \
@ -82,18 +116,29 @@ static inline void FUNC(OPNAME ## _pixels2_l2)(uint8_t *dst, const uint8_t *src1
} \ } \
} \ } \
\ \
static inline void FUNC(OPNAME ## _pixels16_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \ static inline void FUNC(OPNAME ## _pixels16_l2)(uint8_t *dst, \
int src_stride1, int src_stride2, int h){\ const uint8_t *src1, \
FUNC(OPNAME ## _pixels8_l2)(dst , src1 , src2 , dst_stride, src_stride1, src_stride2, h);\ const uint8_t *src2, \
FUNC(OPNAME ## _pixels8_l2)(dst+8*sizeof(pixel), src1+8*sizeof(pixel), src2+8*sizeof(pixel), dst_stride, src_stride1, src_stride2, h);\ int dst_stride, \
int src_stride1, \
int src_stride2, \
int h) \
{ \
FUNC(OPNAME ## _pixels8_l2)(dst, src1, src2, dst_stride, \
src_stride1, src_stride2, h); \
FUNC(OPNAME ## _pixels8_l2)(dst + 8 * sizeof(pixel), \
src1 + 8 * sizeof(pixel), \
src2 + 8 * sizeof(pixel), \
dst_stride, src_stride1, \
src_stride2, h); \
} \ } \
\ \
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16) , FUNCC(OPNAME ## _pixels8) , 8*sizeof(pixel)) CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16), \
FUNCC(OPNAME ## _pixels8), \
8 * sizeof(pixel))
#define op_avg(a, b) a = rnd_avg_pixel4(a, b) #define op_avg(a, b) a = rnd_avg_pixel4(a, b)
#define op_put(a, b) a = b #define op_put(a, b) a = b
DEF_HPEL(avg, op_avg) DEF_HPEL(avg, op_avg)
DEF_HPEL(put, op_put) DEF_HPEL(put, op_put)
#undef op_avg #undef op_avg