Skip to content

F
ffmpeg.wasm-core
Commit 76d7676f authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '2539cf1c' 

* commit '2539cf1c':
  hpeldsp_template: K&R formatting cosmetics

Conflicts:
	libavcodec/hpeldsp_template.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8b66b431 2539cf1c
Hide whitespace changes
Inline Side-by-side
Showing with 297 additions and 213 deletions
libavcodec/hpeldsp_template.c
View file @ 76d7676f
/* /*
* 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,224 +25,307 @@ ...@@ -24,224 +25,307 @@
/** /**
* @file * @file
* Half-pel DSP functions. * Half-pel DSP functions
*/ */
#include "bit_depth_template.c" #include "bit_depth_template.c"
#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, \
int i;\ const uint8_t *src2, \
for(i=0; i<h; i++){\ int dst_stride, \
pixel4 a,b;\ int src_stride1, \
a= AV_RN4P(&src1[i*src_stride1 ]);\ int src_stride2, \
b= AV_RN4P(&src2[i*src_stride2 ]);\ int h) \
OP(*((pixel4*)&dst[i*dst_stride ]), no_rnd_avg_pixel4(a, b));\ { \
a= AV_RN4P(&src1[i*src_stride1+4*sizeof(pixel)]);\ int i; \
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));\ for (i = 0; i < h; i++) { \
}\ pixel4 a, b; \
}\ a = AV_RN4P(&src1[i * src_stride1]); \
\ b = AV_RN4P(&src2[i * src_stride2]); \
static inline void FUNCC(OPNAME ## _no_rnd_pixels8_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ OP(*((pixel4 *) &dst[i * dst_stride]), \
FUNC(OPNAME ## _no_rnd_pixels8_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\ 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)]); \
static inline void FUNCC(OPNAME ## _pixels8_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ OP(*((pixel4 *) &dst[i * dst_stride + 4 * sizeof(pixel)]), \
FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\ no_rnd_avg_pixel4(a, b)); \
}\ } \
\ } \
static inline void FUNCC(OPNAME ## _no_rnd_pixels8_y2)(uint8_t *block, 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 ## _no_rnd_pixels8_x2)(uint8_t *block, \
}\ const uint8_t *pixels, \
\ ptrdiff_t line_size, \
static inline void FUNCC(OPNAME ## _pixels8_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ int h) \
FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\ { \
}\ FUNC(OPNAME ## _no_rnd_pixels8_l2)(block, pixels, pixels + sizeof(pixel), \
\ 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){\ } \
FUNC(OPNAME ## _pixels4_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, \
static inline void FUNCC(OPNAME ## _pixels4_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ ptrdiff_t line_size, \
FUNC(OPNAME ## _pixels4_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\ int h) \
}\ { \
\ FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels + sizeof(pixel), \
static inline void FUNCC(OPNAME ## _pixels2_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ line_size, line_size, line_size, h); \
FUNC(OPNAME ## _pixels2_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, \
static inline void FUNCC(OPNAME ## _pixels2_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\ const uint8_t *pixels, \
FUNC(OPNAME ## _pixels2_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\ 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)\ FUNC(OPNAME ## _no_rnd_pixels8_l2)(block, pixels, pixels + line_size, \
{\ line_size, line_size, line_size, h); \
int i, a0, b0, a1, b1;\ } \
pixel *block = (pixel*)_block;\ \
const pixel *pixels = (const pixel*)_pixels;\ static inline void FUNCC(OPNAME ## _pixels8_y2)(uint8_t *block, \
line_size >>= sizeof(pixel)-1;\ const uint8_t *pixels, \
a0= pixels[0];\ ptrdiff_t line_size, \
b0= pixels[1] + 2;\ int h) \
a0 += b0;\ { \
b0 += pixels[2];\ FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels + line_size, \
\ line_size, line_size, line_size, h); \
pixels+=line_size;\ } \
for(i=0; i<h; i+=2){\ \
a1= pixels[0];\ static inline void FUNCC(OPNAME ## _pixels4_x2)(uint8_t *block, \
b1= pixels[1];\ const uint8_t *pixels, \
a1 += b1;\ ptrdiff_t line_size, \
b1 += pixels[2];\ int h) \
\ { \
block[0]= (a1+a0)>>2; /* FIXME non put */\ FUNC(OPNAME ## _pixels4_l2)(block, pixels, pixels + sizeof(pixel), \
block[1]= (b1+b0)>>2;\ line_size, line_size, line_size, h); \
\ } \
pixels+=line_size;\ \
block +=line_size;\ static inline void FUNCC(OPNAME ## _pixels4_y2)(uint8_t *block, \
\ const uint8_t *pixels, \
a0= pixels[0];\ ptrdiff_t line_size, \
b0= pixels[1] + 2;\ int h) \
a0 += b0;\ { \
b0 += pixels[2];\ FUNC(OPNAME ## _pixels4_l2)(block, pixels, pixels + line_size, \
\ line_size, line_size, line_size, h); \
block[0]= (a1+a0)>>2;\ } \
block[1]= (b1+b0)>>2;\ \
pixels+=line_size;\ static inline void FUNCC(OPNAME ## _pixels2_x2)(uint8_t *block, \
block +=line_size;\ 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)\ FUNC(OPNAME ## _pixels2_l2)(block, pixels, pixels + sizeof(pixel), \
{\ line_size, line_size, line_size, h); \
/* FIXME HIGH BIT DEPTH */\ } \
int i;\ \
const uint32_t a= AV_RN32(pixels );\ static inline void FUNCC(OPNAME ## _pixels2_y2)(uint8_t *block, \
const uint32_t b= AV_RN32(pixels+1);\ const uint8_t *pixels, \
uint32_t l0= (a&0x03030303UL)\ ptrdiff_t line_size, \
+ (b&0x03030303UL)\ int h) \
+ 0x02020202UL;\ { \
uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\ FUNC(OPNAME ## _pixels2_l2)(block, pixels, pixels + line_size, \
+ ((b&0xFCFCFCFCUL)>>2);\ line_size, line_size, line_size, h); \
uint32_t l1,h1;\ } \
\ \
pixels+=line_size;\ static inline void FUNCC(OPNAME ## _pixels2_xy2)(uint8_t *_block, \
for(i=0; i<h; i+=2){\ const uint8_t *_pixels, \
uint32_t a= AV_RN32(pixels );\ ptrdiff_t line_size, \
uint32_t b= AV_RN32(pixels+1);\ int h) \
l1= (a&0x03030303UL)\ { \
+ (b&0x03030303UL);\ int i, a0, b0, a1, b1; \
h1= ((a&0xFCFCFCFCUL)>>2)\ pixel *block = (pixel *) _block; \
+ ((b&0xFCFCFCFCUL)>>2);\ const pixel *pixels = (const pixel *) _pixels; \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ a0 = pixels[0]; \
pixels+=line_size;\ b0 = pixels[1] + 2; \
block +=line_size;\ a0 += b0; \
a= AV_RN32(pixels );\ b0 += pixels[2]; \
b= AV_RN32(pixels+1);\ \
l0= (a&0x03030303UL)\ line_size >>= sizeof(pixel)-1; \
+ (b&0x03030303UL)\ pixels += line_size; \
+ 0x02020202UL;\ for (i = 0; i < h; i += 2) { \
h0= ((a&0xFCFCFCFCUL)>>2)\ a1 = pixels[0]; \
+ ((b&0xFCFCFCFCUL)>>2);\ b1 = pixels[1]; \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ a1 += b1; \
pixels+=line_size;\ b1 += pixels[2]; \
block +=line_size;\ \
}\ block[0] = (a1 + a0) >> 2; /* FIXME non put */ \
}\ block[1] = (b1 + b0) >> 2; \
\ \
static inline void FUNCC(OPNAME ## _pixels8_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)\ pixels += line_size; \
{\ block += line_size; \
/* FIXME HIGH BIT DEPTH */\ \
int j;\ a0 = pixels[0]; \
for(j=0; j<2; j++){\ b0 = pixels[1] + 2; \
int i;\ a0 += b0; \
const uint32_t a= AV_RN32(pixels );\ b0 += pixels[2]; \
const uint32_t b= AV_RN32(pixels+1);\ \
uint32_t l0= (a&0x03030303UL)\ block[0] = (a1 + a0) >> 2; \
+ (b&0x03030303UL)\ block[1] = (b1 + b0) >> 2; \
+ 0x02020202UL;\ pixels += line_size; \
uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\ block += line_size; \
+ ((b&0xFCFCFCFCUL)>>2);\ } \
uint32_t l1,h1;\ } \
\ \
pixels+=line_size;\ static inline void FUNCC(OPNAME ## _pixels4_xy2)(uint8_t *block, \
for(i=0; i<h; i+=2){\ const uint8_t *pixels, \
uint32_t a= AV_RN32(pixels );\ ptrdiff_t line_size, \
uint32_t b= AV_RN32(pixels+1);\ int h) \
l1= (a&0x03030303UL)\ { \
+ (b&0x03030303UL);\ /* FIXME HIGH BIT DEPTH */ \
h1= ((a&0xFCFCFCFCUL)>>2)\ int i; \
+ ((b&0xFCFCFCFCUL)>>2);\ const uint32_t a = AV_RN32(pixels); \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ const uint32_t b = AV_RN32(pixels + 1); \
pixels+=line_size;\ uint32_t l0 = (a & 0x03030303UL) + \
block +=line_size;\ (b & 0x03030303UL) + \
a= AV_RN32(pixels );\ 0x02020202UL; \
b= AV_RN32(pixels+1);\ uint32_t h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
l0= (a&0x03030303UL)\ ((b & 0xFCFCFCFCUL) >> 2); \
+ (b&0x03030303UL)\ uint32_t l1, h1; \
+ 0x02020202UL;\ \
h0= ((a&0xFCFCFCFCUL)>>2)\ pixels += line_size; \
+ ((b&0xFCFCFCFCUL)>>2);\ for (i = 0; i < h; i += 2) { \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ uint32_t a = AV_RN32(pixels); \
pixels+=line_size;\ uint32_t b = AV_RN32(pixels + 1); \
block +=line_size;\ l1 = (a & 0x03030303UL) + \
}\ (b & 0x03030303UL); \
pixels+=4-line_size*(h+1);\ h1 = ((a & 0xFCFCFCFCUL) >> 2) + \
block +=4-line_size*h;\ ((b & 0xFCFCFCFCUL) >> 2); \
}\ OP(*((uint32_t *) block), h0 + h1 + \
}\ (((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
\ pixels += line_size; \
static inline void FUNCC(OPNAME ## _no_rnd_pixels8_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)\ block += line_size; \
{\ a = AV_RN32(pixels); \
/* FIXME HIGH BIT DEPTH */\ b = AV_RN32(pixels + 1); \
int j;\ l0 = (a & 0x03030303UL) + \
for(j=0; j<2; j++){\ (b & 0x03030303UL) + \
int i;\ 0x02020202UL; \
const uint32_t a= AV_RN32(pixels );\ h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
const uint32_t b= AV_RN32(pixels+1);\ ((b & 0xFCFCFCFCUL) >> 2); \
uint32_t l0= (a&0x03030303UL)\ OP(*((uint32_t *) block), h0 + h1 + \
+ (b&0x03030303UL)\ (((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
+ 0x01010101UL;\ pixels += line_size; \
uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\ block += line_size; \
+ ((b&0xFCFCFCFCUL)>>2);\ } \
uint32_t l1,h1;\ } \
\ \
pixels+=line_size;\ static inline void FUNCC(OPNAME ## _pixels8_xy2)(uint8_t *block, \
for(i=0; i<h; i+=2){\ const uint8_t *pixels, \
uint32_t a= AV_RN32(pixels );\ ptrdiff_t line_size, \
uint32_t b= AV_RN32(pixels+1);\ int h) \
l1= (a&0x03030303UL)\ { \
+ (b&0x03030303UL);\ /* FIXME HIGH BIT DEPTH */ \
h1= ((a&0xFCFCFCFCUL)>>2)\ int j; \
+ ((b&0xFCFCFCFCUL)>>2);\ \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ for (j = 0; j < 2; j++) { \
pixels+=line_size;\ int i; \
block +=line_size;\ const uint32_t a = AV_RN32(pixels); \
a= AV_RN32(pixels );\ const uint32_t b = AV_RN32(pixels + 1); \
b= AV_RN32(pixels+1);\ uint32_t l0 = (a & 0x03030303UL) + \
l0= (a&0x03030303UL)\ (b & 0x03030303UL) + \
+ (b&0x03030303UL)\ 0x02020202UL; \
+ 0x01010101UL;\ uint32_t h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
h0= ((a&0xFCFCFCFCUL)>>2)\ ((b & 0xFCFCFCFCUL) >> 2); \
+ ((b&0xFCFCFCFCUL)>>2);\ uint32_t l1, h1; \
OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\ \
pixels+=line_size;\ pixels += line_size; \
block +=line_size;\ for (i = 0; i < h; i += 2) { \
}\ uint32_t a = AV_RN32(pixels); \
pixels+=4-line_size*(h+1);\ uint32_t b = AV_RN32(pixels + 1); \
block +=4-line_size*h;\ l1 = (a & 0x03030303UL) + \
}\ (b & 0x03030303UL); \
}\ h1 = ((a & 0xFCFCFCFCUL) >> 2) + \
\ ((b & 0xFCFCFCFCUL) >> 2); \
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_x2) , FUNCC(OPNAME ## _pixels8_x2) , 8*sizeof(pixel))\ OP(*((uint32_t *) block), h0 + h1 + \
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_y2) , FUNCC(OPNAME ## _pixels8_y2) , 8*sizeof(pixel))\ (((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_xy2), FUNCC(OPNAME ## _pixels8_xy2), 8*sizeof(pixel))\ pixels += line_size; \
av_unused CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16) , FUNCC(OPNAME ## _pixels8) , 8*sizeof(pixel))\ block += line_size; \
CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_x2) , FUNCC(OPNAME ## _no_rnd_pixels8_x2) , 8*sizeof(pixel))\ a = AV_RN32(pixels); \
CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_y2) , FUNCC(OPNAME ## _no_rnd_pixels8_y2) , 8*sizeof(pixel))\ b = AV_RN32(pixels + 1); \
CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_xy2), FUNCC(OPNAME ## _no_rnd_pixels8_xy2), 8*sizeof(pixel))\ 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; \
} \
pixels += 4 - line_size * (h + 1); \
block += 4 - line_size * 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 */ \
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) + \
0x01010101UL; \
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)); \
pixels += line_size; \
block += line_size; \
a = AV_RN32(pixels); \
b = AV_RN32(pixels + 1); \
l0 = (a & 0x03030303UL) + \
(b & 0x03030303UL) + \
0x01010101UL; \
h0 = ((a & 0xFCFCFCFCUL) >> 2) + \
((b & 0xFCFCFCFCUL) >> 2); \
OP(*((uint32_t *) block), h0 + h1 + \
(((l0 + l1) >> 2) & 0x0F0F0F0FUL)); \
pixels += line_size; \
block += line_size; \
} \
pixels += 4 - line_size * (h + 1); \
block += 4 - line_size * h; \
} \
} \
\
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_x2), \
FUNCC(OPNAME ## _pixels8_x2), \
8 * sizeof(pixel)) \
CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_y2), \
FUNCC(OPNAME ## _pixels8_y2), \
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment