* DSP utils
*/
-#include "bit_depth_template.c"
-
-#if BIT_DEPTH == 8
-/* draw the edges of width 'w' of an image of size width, height */
-// 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);
- pixel *ptr = buf, *last_line;
- int i;
-
- /* left and right */
- for (i = 0; i < height; i++) {
- memset(ptr - w, ptr[0], w);
- memset(ptr + width, ptr[width - 1], w);
- ptr += wrap;
- }
-
- /* top and bottom + corners */
- buf -= w;
- last_line = buf + (height - 1) * wrap;
- if (sides & EDGE_TOP)
- for (i = 0; i < h; i++)
- // top
- memcpy(buf - (i + 1) * wrap, buf, (width + w + w) * sizeof(pixel));
- if (sides & EDGE_BOTTOM)
- for (i = 0; i < h; i++)
- // bottom
- memcpy(last_line + (i + 1) * wrap, last_line,
- (width + w + w) * sizeof(pixel));
-}
-#endif
-
-static void FUNCC(get_pixels)(int16_t *av_restrict block, const uint8_t *_pixels,
- int line_size)
-{
- const pixel *pixels = (const pixel *) _pixels;
- int i;
-
- /* read the pixels */
- for (i = 0; i < 8; i++) {
- block[0] = pixels[0];
- block[1] = pixels[1];
- block[2] = pixels[2];
- block[3] = pixels[3];
- block[4] = pixels[4];
- block[5] = pixels[5];
- block[6] = pixels[6];
- block[7] = pixels[7];
- pixels += line_size / sizeof(pixel);
- block += 8;
- }
-}
-
-#if BIT_DEPTH == 8
-static void FUNCC(clear_block)(int16_t *block)
-{
- memset(block, 0, sizeof(int16_t) * 64);
-}
-
-static void FUNCC(clear_blocks)(int16_t *blocks)
-{
- memset(blocks, 0, sizeof(int16_t) * 6 * 64);
-}
-#endif
-
-#if BIT_DEPTH == 8
-#include "hpel_template.c"
-#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 OPNAME ## _no_rnd_pixels8_l2_8(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)); \
- 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)); \
+ uint32_t a, b; \
+ a = AV_RN32(&src1[i * src_stride1]); \
+ b = AV_RN32(&src2[i * src_stride2]); \
+ OP(*((uint32_t *) &dst[i * dst_stride]), \
+ no_rnd_avg32(a, b)); \
+ a = AV_RN32(&src1[i * src_stride1 + 4]); \
+ b = AV_RN32(&src2[i * src_stride2 + 4]); \
+ OP(*((uint32_t *) &dst[i * dst_stride + 4]), \
+ no_rnd_avg32(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) \
+static inline void OPNAME ## _no_rnd_pixels16_l2_8(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); \
+ OPNAME ## _no_rnd_pixels8_l2_8(dst, src1, src2, dst_stride, \
+ src_stride1, src_stride2, h); \
+ OPNAME ## _no_rnd_pixels8_l2_8(dst + 8, \
+ src1 + 8, \
+ src2 + 8, \
+ 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 OPNAME ## _pixels8_l4_8(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; \
} \
} \
\
-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 OPNAME ## _no_rnd_pixels8_l4_8(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; \
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 ## _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) \
+ \
+static inline void OPNAME ## _pixels16_l4_8(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); \
+ OPNAME ## _pixels8_l4_8(dst, src1, src2, src3, src4, dst_stride, \
+ src_stride1, src_stride2, src_stride3, \
+ src_stride4, h); \
+ OPNAME ## _pixels8_l4_8(dst + 8, \
+ src1 + 8, src2 + 8, \
+ src3 + 8, src4 + 8, \
+ 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 OPNAME ## _no_rnd_pixels16_l4_8(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 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 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) + \
- 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; \
- } \
+ OPNAME ## _no_rnd_pixels8_l4_8(dst, src1, src2, src3, src4, \
+ dst_stride, src_stride1, \
+ src_stride2, src_stride3, \
+ src_stride4, h); \
+ OPNAME ## _no_rnd_pixels8_l4_8(dst + 8, \
+ src1 + 8, src2 + 8, \
+ src3 + 8, src4 + 8, \
+ dst_stride, src_stride1, \
+ src_stride2, src_stride3, \
+ src_stride4, h); \
} \
- \
-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_avg(a, b) a = rnd_avg32(a, b)
#define op_put(a, b) a = b
-#if BIT_DEPTH == 8
#define put_no_rnd_pixels8_8_c put_pixels8_8_c
PIXOP2(avg, op_avg)
PIXOP2(put, op_put)
-#endif
#undef op_avg
#undef op_put
projects / ffmpeg / blobdiff