highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9'

Browse Source 
* commit '2539cf1c814190a017cb8986b41aa2f949e37fd9':
  hpeldsp_template: K&R formatting cosmetics

Conflicts:
	libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-20 20:52:19 +01:00
parent 8b66b43128 2539cf1c81
commit 76d7676fcc
1 changed files with 297 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

248
libavcodec/hpeldsp_template.c
View File

@ -1,5 +1,6 @@
/* /*
* Half-pel DSP functions. * Half-pel DSP functions
*
* Copyright (c) 2000, 2001 Fabrice Bellard * Copyright (c) 2000, 2001 Fabrice Bellard
* Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
* *
@ -24,7 +25,7 @@
/** /**
* @file * @file
* Half-pel DSP functions. * Half-pel DSP functions
*/ */
#include "bit_depth_template.c" #include "bit_depth_template.c"
@ -32,63 +33,115 @@
#include "hpel_template.c" #include "hpel_template.c"
#define PIXOP2(OPNAME, OP) \ #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, \ static inline void FUNC(OPNAME ## _no_rnd_pixels8_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; \
a = AV_RN4P(&src1[i * src_stride1]); \ a = AV_RN4P(&src1[i * src_stride1]); \
b = AV_RN4P(&src2[i * src_stride2]); \ 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)]); \ 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)]), no_rnd_avg_pixel4(a, b));\ OP(*((pixel4 *) &dst[i * dst_stride + 4 * sizeof(pixel)]), \
no_rnd_avg_pixel4(a, b)); \
} \ } \
} \ } \
\ \
static inline void FUNCC(OPNAME ## _no_rnd_pixels8_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ static inline void FUNCC(OPNAME ## _no_rnd_pixels8_x2)(uint8_t *block, \
FUNC(OPNAME ## _no_rnd_pixels8_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\ const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \
FUNC(OPNAME ## _no_rnd_pixels8_l2)(block, pixels, pixels + sizeof(pixel), \
line_size, line_size, line_size, h); \
} \ } \
\ \
static inline void FUNCC(OPNAME ## _pixels8_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ static inline void FUNCC(OPNAME ## _pixels8_x2)(uint8_t *block, \
FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\ const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \
FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels + sizeof(pixel), \
line_size, line_size, line_size, h); \
} \ } \
\ \
static inline void FUNCC(OPNAME ## _no_rnd_pixels8_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ static inline void FUNCC(OPNAME ## _no_rnd_pixels8_y2)(uint8_t *block, \
FUNC(OPNAME ## _no_rnd_pixels8_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\ const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \
FUNC(OPNAME ## _no_rnd_pixels8_l2)(block, pixels, pixels + line_size, \
line_size, line_size, line_size, h); \
} \ } \
\ \
static inline void FUNCC(OPNAME ## _pixels8_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ static inline void FUNCC(OPNAME ## _pixels8_y2)(uint8_t *block, \
FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\ const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \
FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels + line_size, \
line_size, line_size, line_size, h); \
} \ } \
\ \
static inline void FUNCC(OPNAME ## _pixels4_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ static inline void FUNCC(OPNAME ## _pixels4_x2)(uint8_t *block, \
FUNC(OPNAME ## _pixels4_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\ const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \
FUNC(OPNAME ## _pixels4_l2)(block, pixels, pixels + sizeof(pixel), \
line_size, line_size, line_size, h); \
} \ } \
\ \
static inline void FUNCC(OPNAME ## _pixels4_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ static inline void FUNCC(OPNAME ## _pixels4_y2)(uint8_t *block, \
FUNC(OPNAME ## _pixels4_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\ const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \
FUNC(OPNAME ## _pixels4_l2)(block, pixels, pixels + line_size, \
line_size, line_size, line_size, h); \
} \ } \
\ \
static inline void FUNCC(OPNAME ## _pixels2_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ static inline void FUNCC(OPNAME ## _pixels2_x2)(uint8_t *block, \
FUNC(OPNAME ## _pixels2_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\ const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \
FUNC(OPNAME ## _pixels2_l2)(block, pixels, pixels + sizeof(pixel), \
line_size, line_size, line_size, h); \
} \ } \
\ \
static inline void FUNCC(OPNAME ## _pixels2_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ static inline void FUNCC(OPNAME ## _pixels2_y2)(uint8_t *block, \
FUNC(OPNAME ## _pixels2_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\ const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \
FUNC(OPNAME ## _pixels2_l2)(block, pixels, pixels + line_size, \
line_size, line_size, line_size, h); \
} \ } \
\ \
static inline void FUNCC(OPNAME ## _pixels2_xy2)(uint8_t *_block, const uint8_t *_pixels, ptrdiff_t line_size, int h)\ static inline void FUNCC(OPNAME ## _pixels2_xy2)(uint8_t *_block, \
const uint8_t *_pixels, \
ptrdiff_t line_size, \
int h) \
{ \ { \
int i, a0, b0, a1, b1; \ int i, a0, b0, a1, b1; \
pixel *block = (pixel *) _block; \ pixel *block = (pixel *) _block; \
const pixel *pixels = (const pixel *) _pixels; \ const pixel *pixels = (const pixel *) _pixels; \
line_size >>= sizeof(pixel)-1;\
a0 = pixels[0]; \ a0 = pixels[0]; \
b0 = pixels[1] + 2; \ b0 = pixels[1] + 2; \
a0 += b0; \ a0 += b0; \
b0 += pixels[2]; \ b0 += pixels[2]; \
\ \
line_size >>= sizeof(pixel)-1; \
pixels += line_size; \ pixels += line_size; \
for (i = 0; i < h; i += 2) { \ for (i = 0; i < h; i += 2) { \
a1 = pixels[0]; \ a1 = pixels[0]; \
@ -114,77 +167,88 @@ static inline void FUNCC(OPNAME ## _pixels2_xy2)(uint8_t *_block, const uint8_t
} \ } \
} \ } \
\ \
static inline void FUNCC(OPNAME ## _pixels4_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)\ static inline void FUNCC(OPNAME ## _pixels4_xy2)(uint8_t *block, \
const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \ { \
/* FIXME HIGH BIT DEPTH */ \ /* FIXME HIGH BIT DEPTH */ \
int i; \ int i; \
const uint32_t a = AV_RN32(pixels); \ const uint32_t a = AV_RN32(pixels); \
const uint32_t b = AV_RN32(pixels + 1); \ const uint32_t b = AV_RN32(pixels + 1); \
uint32_t l0= (a&0x03030303UL)\ uint32_t l0 = (a & 0x03030303UL) + \
+ (b&0x03030303UL)\ (b & 0x03030303UL) + \
+ 0x02020202UL;\ 0x02020202UL; \
uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\ uint32_t h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
+ ((b&0xFCFCFCFCUL)>>2);\ ((b & 0xFCFCFCFCUL) >> 2); \
uint32_t l1, h1; \ uint32_t l1, h1; \
\ \
pixels += line_size; \ pixels += line_size; \
for (i = 0; i < h; i += 2) { \ for (i = 0; i < h; i += 2) { \
uint32_t a = AV_RN32(pixels); \ uint32_t a = AV_RN32(pixels); \
uint32_t b = AV_RN32(pixels + 1); \ uint32_t b = AV_RN32(pixels + 1); \
l1= (a&0x03030303UL)\ l1 = (a & 0x03030303UL) + \
+ (b&0x03030303UL);\ (b & 0x03030303UL); \
h1= ((a&0xFCFCFCFCUL)>>2)\ h1 = ((a & 0xFCFCFCFCUL) >> 2) + \
+ ((b&0xFCFCFCFCUL)>>2);\ ((b & 0xFCFCFCFCUL) >> 2); \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ OP(*((uint32_t *) block), h0 + h1 + \
(((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
pixels += line_size; \ pixels += line_size; \
block += line_size; \ block += line_size; \
a = AV_RN32(pixels); \ a = AV_RN32(pixels); \
b = AV_RN32(pixels + 1); \ b = AV_RN32(pixels + 1); \
l0= (a&0x03030303UL)\ l0 = (a & 0x03030303UL) + \
+ (b&0x03030303UL)\ (b & 0x03030303UL) + \
+ 0x02020202UL;\ 0x02020202UL; \
h0= ((a&0xFCFCFCFCUL)>>2)\ h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
+ ((b&0xFCFCFCFCUL)>>2);\ ((b & 0xFCFCFCFCUL) >> 2); \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ OP(*((uint32_t *) block), h0 + h1 + \
(((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
pixels += line_size; \ pixels += line_size; \
block += line_size; \ block += line_size; \
} \ } \
} \ } \
\ \
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 */ \ /* FIXME HIGH BIT DEPTH */ \
int j; \ int j; \
\
for (j = 0; j < 2; j++) { \ for (j = 0; j < 2; j++) { \
int i; \ int i; \
const uint32_t a = AV_RN32(pixels); \ const uint32_t a = AV_RN32(pixels); \
const uint32_t b = AV_RN32(pixels + 1); \ const uint32_t b = AV_RN32(pixels + 1); \
uint32_t l0= (a&0x03030303UL)\ uint32_t l0 = (a & 0x03030303UL) + \
+ (b&0x03030303UL)\ (b & 0x03030303UL) + \
+ 0x02020202UL;\ 0x02020202UL; \
uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\ uint32_t h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
+ ((b&0xFCFCFCFCUL)>>2);\ ((b & 0xFCFCFCFCUL) >> 2); \
uint32_t l1, h1; \ uint32_t l1, h1; \
\ \
pixels += line_size; \ pixels += line_size; \
for (i = 0; i < h; i += 2) { \ for (i = 0; i < h; i += 2) { \
uint32_t a = AV_RN32(pixels); \ uint32_t a = AV_RN32(pixels); \
uint32_t b = AV_RN32(pixels + 1); \ uint32_t b = AV_RN32(pixels + 1); \
l1= (a&0x03030303UL)\ l1 = (a & 0x03030303UL) + \
+ (b&0x03030303UL);\ (b & 0x03030303UL); \
h1= ((a&0xFCFCFCFCUL)>>2)\ h1 = ((a & 0xFCFCFCFCUL) >> 2) + \
+ ((b&0xFCFCFCFCUL)>>2);\ ((b & 0xFCFCFCFCUL) >> 2); \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ OP(*((uint32_t *) block), h0 + h1 + \
(((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
pixels += line_size; \ pixels += line_size; \
block += line_size; \ block += line_size; \
a = AV_RN32(pixels); \ a = AV_RN32(pixels); \
b = AV_RN32(pixels + 1); \ b = AV_RN32(pixels + 1); \
l0= (a&0x03030303UL)\ l0 = (a & 0x03030303UL) + \
+ (b&0x03030303UL)\ (b & 0x03030303UL) + \
+ 0x02020202UL;\ 0x02020202UL; \
h0= ((a&0xFCFCFCFCUL)>>2)\ h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
+ ((b&0xFCFCFCFCUL)>>2);\ ((b & 0xFCFCFCFCUL) >> 2); \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ OP(*((uint32_t *) block), h0 + h1 + \
(((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
pixels += line_size; \ pixels += line_size; \
block += line_size; \ block += line_size; \
} \ } \
@ -193,40 +257,46 @@ static inline void FUNCC(OPNAME ## _pixels8_xy2)(uint8_t *block, const uint8_t *
} \ } \
} \ } \
\ \
static inline void FUNCC(OPNAME ## _no_rnd_pixels8_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)\ static inline void FUNCC(OPNAME ## _no_rnd_pixels8_xy2)(uint8_t *block, \
const uint8_t *pixels, \
ptrdiff_t line_size, \
int h) \
{ \ { \
/* FIXME HIGH BIT DEPTH */ \ /* FIXME HIGH BIT DEPTH */ \
int j; \ int j; \
\
for (j = 0; j < 2; j++) { \ for (j = 0; j < 2; j++) { \
int i; \ int i; \
const uint32_t a = AV_RN32(pixels); \ const uint32_t a = AV_RN32(pixels); \
const uint32_t b = AV_RN32(pixels + 1); \ const uint32_t b = AV_RN32(pixels + 1); \
uint32_t l0= (a&0x03030303UL)\ uint32_t l0 = (a & 0x03030303UL) + \
+ (b&0x03030303UL)\ (b & 0x03030303UL) + \
+ 0x01010101UL;\ 0x01010101UL; \
uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\ uint32_t h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
+ ((b&0xFCFCFCFCUL)>>2);\ ((b & 0xFCFCFCFCUL) >> 2); \
uint32_t l1, h1; \ uint32_t l1, h1; \
\ \
pixels += line_size; \ pixels += line_size; \
for (i = 0; i < h; i += 2) { \ for (i = 0; i < h; i += 2) { \
uint32_t a = AV_RN32(pixels); \ uint32_t a = AV_RN32(pixels); \
uint32_t b = AV_RN32(pixels + 1); \ uint32_t b = AV_RN32(pixels + 1); \
l1= (a&0x03030303UL)\ l1 = (a & 0x03030303UL) + \
+ (b&0x03030303UL);\ (b & 0x03030303UL); \
h1= ((a&0xFCFCFCFCUL)>>2)\ h1 = ((a & 0xFCFCFCFCUL) >> 2) + \
+ ((b&0xFCFCFCFCUL)>>2);\ ((b & 0xFCFCFCFCUL) >> 2); \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ OP(*((uint32_t *) block), h0 + h1 + \
(((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
pixels += line_size; \ pixels += line_size; \
block += line_size; \ block += line_size; \
a = AV_RN32(pixels); \ a = AV_RN32(pixels); \
b = AV_RN32(pixels + 1); \ b = AV_RN32(pixels + 1); \
l0= (a&0x03030303UL)\ l0 = (a & 0x03030303UL) + \
+ (b&0x03030303UL)\ (b & 0x03030303UL) + \
+ 0x01010101UL;\ 0x01010101UL; \
h0= ((a&0xFCFCFCFCUL)>>2)\ h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
+ ((b&0xFCFCFCFCUL)>>2);\ ((b & 0xFCFCFCFCUL) >> 2); \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ OP(*((uint32_t *) block), h0 + h1 + \
(((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
pixels += line_size; \ pixels += line_size; \
block += line_size; \ block += line_size; \
} \ } \
@ -235,13 +305,27 @@ static inline void FUNCC(OPNAME ## _no_rnd_pixels8_xy2)(uint8_t *block, const ui
} \ } \
} \ } \
\ \
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_x2) , FUNCC(OPNAME ## _pixels8_x2) , 8*sizeof(pixel))\ CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_x2), \
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_y2) , FUNCC(OPNAME ## _pixels8_y2) , 8*sizeof(pixel))\ FUNCC(OPNAME ## _pixels8_x2), \
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_xy2), FUNCC(OPNAME ## _pixels8_xy2), 8*sizeof(pixel))\ 8 * sizeof(pixel)) \
av_unused CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16) , FUNCC(OPNAME ## _pixels8) , 8*sizeof(pixel))\ CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_y2), \
CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_x2) , FUNCC(OPNAME ## _no_rnd_pixels8_x2) , 8*sizeof(pixel))\ FUNCC(OPNAME ## _pixels8_y2), \
CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_y2) , FUNCC(OPNAME ## _no_rnd_pixels8_y2) , 8*sizeof(pixel))\ 8 * sizeof(pixel)) \
CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_xy2), FUNCC(OPNAME ## _no_rnd_pixels8_xy2), 8*sizeof(pixel))\ CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_xy2), \
FUNCC(OPNAME ## _pixels8_xy2), \
8 * sizeof(pixel)) \
av_unused CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16), \
FUNCC(OPNAME ## _pixels8), \
8 * sizeof(pixel)) \
CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_x2), \
FUNCC(OPNAME ## _no_rnd_pixels8_x2), \
8 * sizeof(pixel)) \
CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_y2), \
FUNCC(OPNAME ## _no_rnd_pixels8_y2), \
8 * sizeof(pixel)) \
CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_xy2), \
FUNCC(OPNAME ## _no_rnd_pixels8_xy2), \
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