Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224'

Browse Source 
* commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224':
  hpel_template: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/293/head
Michael Niedermayer 11 years ago
parent d3ed8a4d2b e8eace3276
commit da760a64d1
1 changed files with 117 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 189
      libavcodec/hpel_template.c

189
libavcodec/hpel_template.c
Unescape View File

@ -19,81 +19,126 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#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, \
int i;\ const uint8_t *pixels, \
for(i=0; i<h; i++){\ ptrdiff_t line_size, \
OP(*((pixel2*)(block )), AV_RN2P(pixels ));\ int h) \
pixels+=line_size;\ { \
block +=line_size;\ int i; \
}\ for (i = 0; i < h; i++) { \
}\ OP(*((pixel2 *) (block)), AV_RN2P(pixels)); \
static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ pixels += line_size; \
int i;\ block += line_size; \
for(i=0; i<h; i++){\ } \
OP(*((pixel4*)(block )), AV_RN4P(pixels ));\ } \
pixels+=line_size;\ \
block +=line_size;\ static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block, \
}\ const uint8_t *pixels, \
}\ ptrdiff_t line_size, \
static inline void FUNCC(OPNAME ## _pixels8)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ int h) \
int i;\ { \
for(i=0; i<h; i++){\ int i; \
OP(*((pixel4*)(block )), AV_RN4P(pixels ));\ for (i = 0; i < h; i++) { \
OP(*((pixel4*)(block+4*sizeof(pixel))), AV_RN4P(pixels+4*sizeof(pixel)));\ OP(*((pixel4 *) (block)), AV_RN4P(pixels)); \
pixels+=line_size;\ pixels += line_size; \
block +=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, \
int i;\ ptrdiff_t line_size, \
for(i=0; i<h; i++){\ int h) \
pixel4 a,b;\ { \
a= AV_RN4P(&src1[i*src_stride1 ]);\ int i; \
b= AV_RN4P(&src2[i*src_stride2 ]);\ for (i = 0; i < h; i++) { \
OP(*((pixel4*)&dst[i*dst_stride ]), rnd_avg_pixel4(a, b));\ OP(*((pixel4 *) (block)), AV_RN4P(pixels)); \
a= AV_RN4P(&src1[i*src_stride1+4*sizeof(pixel)]);\ OP(*((pixel4 *) (block + 4 * sizeof(pixel))), \
b= AV_RN4P(&src2[i*src_stride2+4*sizeof(pixel)]);\ AV_RN4P(pixels + 4 * sizeof(pixel))); \
OP(*((pixel4*)&dst[i*dst_stride+4*sizeof(pixel)]), rnd_avg_pixel4(a, b));\ pixels += line_size; \
}\ block += line_size; \
}\ } \
\ } \
static inline void FUNC(OPNAME ## _pixels4_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 ## _pixels8_l2)(uint8_t *dst, \
int i;\ const uint8_t *src1, \
for(i=0; i<h; i++){\ const uint8_t *src2, \
pixel4 a,b;\ int dst_stride, \
a= AV_RN4P(&src1[i*src_stride1 ]);\ int src_stride1, \
b= AV_RN4P(&src2[i*src_stride2 ]);\ int src_stride2, \
OP(*((pixel4*)&dst[i*dst_stride ]), rnd_avg_pixel4(a, b));\ int h) \
}\ { \
}\ int i; \
\ for (i = 0; i < h; i++) { \
static inline void FUNC(OPNAME ## _pixels2_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \ pixel4 a, b; \
int src_stride1, int src_stride2, int h){\ a = AV_RN4P(&src1[i * src_stride1]); \
int i;\ b = AV_RN4P(&src2[i * src_stride2]); \
for(i=0; i<h; i++){\ OP(*((pixel4 *) &dst[i * dst_stride]), rnd_avg_pixel4(a, b)); \
pixel4 a,b;\ a = AV_RN4P(&src1[i * src_stride1 + 4 * sizeof(pixel)]); \
a= AV_RN2P(&src1[i*src_stride1 ]);\ b = AV_RN4P(&src2[i * src_stride2 + 4 * sizeof(pixel)]); \
b= AV_RN2P(&src2[i*src_stride2 ]);\ OP(*((pixel4 *) &dst[i * dst_stride + 4 * sizeof(pixel)]), \
OP(*((pixel2*)&dst[i*dst_stride ]), rnd_avg_pixel4(a, b));\ rnd_avg_pixel4(a, b)); \
}\ } \
}\ } \
\ \
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 ## _pixels4_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, \
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16) , FUNCC(OPNAME ## _pixels8) , 8*sizeof(pixel)) 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]), rnd_avg_pixel4(a, b)); \
} \
} \
\
static inline void FUNC(OPNAME ## _pixels2_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_RN2P(&src1[i * src_stride1]); \
b = AV_RN2P(&src2[i * src_stride2]); \
OP(*((pixel2 *) &dst[i * dst_stride]), rnd_avg_pixel4(a, b)); \
} \
} \
\
static inline void FUNC(OPNAME ## _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 ## _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))
#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

Write Preview
Loading…
Cancel
Save