--- interpolate8x8.h 2002/07/24 00:50:10 1.5 +++ interpolate8x8.h 2002/10/05 21:30:50 1.5.2.2 @@ -1,3 +1,6 @@ +#ifndef _INTERPOLATE8X8_H_ +#define _INTERPOLATE8X8_H_ + #include "../utils/mem_transfer.h" typedef void (INTERPOLATE8X8) (uint8_t * const dst, @@ -6,10 +9,59 @@ const uint32_t rounding); typedef INTERPOLATE8X8 *INTERPOLATE8X8_PTR; +typedef void (INTERPOLATE8X8_AVG2) (uint8_t *dst, + const uint8_t *src1, + const uint8_t *src2, + const uint32_t stride, + const uint32_t rounding); +typedef INTERPOLATE8X8_AVG2 *INTERPOLATE8X8_AVG2_PTR; + +typedef void (INTERPOLATE8X8_AVG4) (uint8_t *dst, + const uint8_t *src1, + const uint8_t *src2, + const uint8_t *src3, + const uint8_t *src4, + const uint32_t stride, + const uint32_t rounding); +typedef INTERPOLATE8X8_AVG4 *INTERPOLATE8X8_AVG4_PTR; + +typedef void (INTERPOLATE8X8_LOWPASS) (uint8_t *dst, + uint8_t *src, + int32_t stride, + int32_t rounding); + +typedef INTERPOLATE8X8_LOWPASS *INTERPOLATE8X8_LOWPASS_PTR; + +typedef void (INTERPOLATE8X8_LOWPASS_HV) (uint8_t *dst1, + uint8_t *dst2, + uint8_t *src, + int32_t stride, + int32_t rounding); + +typedef INTERPOLATE8X8_LOWPASS_HV *INTERPOLATE8X8_LOWPASS_HV_PTR; + +typedef void (INTERPOLATE8X8_6TAP_LOWPASS) (uint8_t *dst, + uint8_t *src, + int32_t stride, + int32_t rounding); + +typedef INTERPOLATE8X8_6TAP_LOWPASS *INTERPOLATE8X8_6TAP_LOWPASS_PTR; + extern INTERPOLATE8X8_PTR interpolate8x8_halfpel_h; extern INTERPOLATE8X8_PTR interpolate8x8_halfpel_v; extern INTERPOLATE8X8_PTR interpolate8x8_halfpel_hv; +extern INTERPOLATE8X8_AVG2_PTR interpolate8x8_avg2; +extern INTERPOLATE8X8_AVG4_PTR interpolate8x8_avg4; + +extern INTERPOLATE8X8_LOWPASS_PTR interpolate8x8_lowpass_h; +extern INTERPOLATE8X8_LOWPASS_PTR interpolate8x8_lowpass_v; + +extern INTERPOLATE8X8_LOWPASS_HV_PTR interpolate8x8_lowpass_hv; + +extern INTERPOLATE8X8_6TAP_LOWPASS_PTR interpolate8x8_6tap_lowpass_h; +extern INTERPOLATE8X8_6TAP_LOWPASS_PTR interpolate8x8_6tap_lowpass_v; + INTERPOLATE8X8 interpolate8x8_halfpel_h_c; INTERPOLATE8X8 interpolate8x8_halfpel_v_c; INTERPOLATE8X8 interpolate8x8_halfpel_hv_c; @@ -30,17 +82,21 @@ INTERPOLATE8X8 interpolate8x8_halfpel_v_ia64; INTERPOLATE8X8 interpolate8x8_halfpel_hv_ia64; -void interpolate8x8_lowpass_h(uint8_t *dst, uint8_t *src, int32_t dst_stride, int32_t src_stride, int32_t rounding); -void interpolate8x8_lowpass_v(uint8_t *dst, uint8_t *src, int32_t dst_stride, int32_t src_stride, int32_t rounding); -void interpolate8x8_lowpass_hv(uint8_t *dst1, uint8_t *dst2, uint8_t *src, int32_t dst1_stride, int32_t dst2_stride, int32_t src_stride, int32_t rounding); -void interpolate8x8_bilinear2(uint8_t *dst, uint8_t *src1, uint8_t *src2, int32_t dst_stride, int32_t src_stride, int32_t rounding); -void interpolate8x8_bilinear4(uint8_t *dst, uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4, int32_t stride, int32_t rounding); +INTERPOLATE8X8_AVG2 interpolate8x8_avg2_c; +INTERPOLATE8X8_AVG4 interpolate8x8_avg4_c; -void interpolate8x8_c(uint8_t * const dst, - const uint8_t * const src, - const uint32_t x, - const uint32_t y, - const uint32_t stride); +INTERPOLATE8X8_AVG2 interpolate8x8_avg2_mmx; +INTERPOLATE8X8_AVG4 interpolate8x8_avg4_mmx; + +INTERPOLATE8X8_LOWPASS interpolate8x8_lowpass_h_c; +INTERPOLATE8X8_LOWPASS interpolate8x8_lowpass_v_c; +INTERPOLATE8X8_LOWPASS_HV interpolate8x8_lowpass_hv_c; + +INTERPOLATE8X8_6TAP_LOWPASS interpolate8x8_6tap_lowpass_h_c; +INTERPOLATE8X8_6TAP_LOWPASS interpolate8x8_6tap_lowpass_v_c; + +INTERPOLATE8X8_6TAP_LOWPASS interpolate8x8_6tap_lowpass_h_mmx; +INTERPOLATE8X8_6TAP_LOWPASS interpolate8x8_6tap_lowpass_v_mmx; static __inline void interpolate8x8_switch(uint8_t * const cur, @@ -89,9 +145,56 @@ } } +static __inline uint8_t * +interpolate8x8_switch2(uint8_t * const buffer, + const uint8_t * const refn, + const uint32_t x, + const uint32_t y, + const int32_t dx, + const int dy, + const uint32_t stride, + const uint32_t rounding) +{ + int32_t ddx, ddy; + + switch (((dx & 1) << 1) + (dy & 1)) // ((dx%2)?2:0)+((dy%2)?1:0) + { + case 0: + return (uint8_t *)refn + (int)((y + dy/2) * stride + x + dx/2); + + case 1: + ddx = dx / 2; + ddy = (dy - 1) / 2; + interpolate8x8_halfpel_v(buffer, + refn + (int)((y + ddy) * stride + x + ddx), stride, + rounding); + break; + + case 2: + ddx = (dx - 1) / 2; + ddy = dy / 2; + interpolate8x8_halfpel_h(buffer, + refn + (int)((y + ddy) * stride + x + ddx), stride, + rounding); + break; + + default: + ddx = (dx - 1) / 2; + ddy = (dy - 1) / 2; + interpolate8x8_halfpel_hv(buffer, + refn + (int)((y + ddy) * stride + x + ddx), stride, + rounding); + break; + } + return buffer; +} + static __inline void interpolate8x8_quarterpel(uint8_t * const cur, uint8_t * const refn, + uint8_t * const refh, + uint8_t * const refv, + uint8_t * const refhv, const uint32_t x, const uint32_t y, const int32_t dx, const int dy, const uint32_t stride, @@ -101,12 +204,9 @@ const int32_t yRef = y*4 + dy; uint8_t *src, *dst; + uint8_t *halfpel_h, *halfpel_v, *halfpel_hv; int32_t x_int, y_int, x_frac, y_frac; - uint8_t halfpel_h[72]; - uint8_t halfpel_v[64]; - uint8_t halfpel_hv[64]; - x_int = xRef/4; if (xRef < 0 && xRef % 4) x_int--; @@ -120,6 +220,10 @@ y_frac = yRef - (4*y_int); src = refn + y_int * stride + x_int; + halfpel_h = refh; + halfpel_v = refv; + halfpel_hv = refhv; + dst = cur + y * stride + x; switch((y_frac << 2) | (x_frac)) { @@ -129,81 +233,83 @@ break; case 1: - interpolate8x8_lowpass_h(halfpel_h, src, 8, stride, rounding); - interpolate8x8_bilinear2(dst, src, halfpel_h, stride, stride, rounding); + interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding); + interpolate8x8_avg2(dst, src, halfpel_h, stride, rounding); break; case 2: - interpolate8x8_lowpass_h(dst, src, stride, stride, rounding); + interpolate8x8_lowpass_h(dst, src, stride, rounding); break; case 3: - interpolate8x8_lowpass_h(halfpel_h, src, 8, stride, rounding); - interpolate8x8_bilinear2(dst, src+1, halfpel_h, stride, stride, rounding); + interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding); + interpolate8x8_avg2(dst, src + 1, halfpel_h, stride, rounding); break; case 4: - interpolate8x8_lowpass_v(halfpel_v, src, 8, stride, rounding); - interpolate8x8_bilinear2(dst, src, halfpel_v, stride, stride, rounding); + interpolate8x8_lowpass_v(halfpel_v, src, stride, rounding); + interpolate8x8_avg2(dst, src, halfpel_v, stride, rounding); break; case 5: - interpolate8x8_lowpass_v(halfpel_v, src, 8, stride, rounding); - interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, 8, 8, stride, rounding); - interpolate8x8_bilinear4(dst, src, halfpel_h, halfpel_v, halfpel_hv, stride, rounding); + interpolate8x8_lowpass_v(halfpel_v, src, stride, rounding); + interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); + interpolate8x8_avg4(dst, src, halfpel_h, halfpel_v, halfpel_hv, stride, rounding); break; case 6: - interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, 8, 8, stride, rounding); - interpolate8x8_bilinear2(dst, halfpel_h, halfpel_hv, stride, 8, 1-rounding); + interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); + interpolate8x8_avg2(dst, halfpel_h, halfpel_hv, stride, rounding); break; case 7: - interpolate8x8_lowpass_v(halfpel_v, src+1, 8, stride, 16-rounding); - interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, 8, 8, stride, rounding); - interpolate8x8_bilinear4(dst, src+1, halfpel_h, halfpel_v, halfpel_hv, stride, rounding); + interpolate8x8_lowpass_v(halfpel_v, src+1, stride, rounding); + interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); + interpolate8x8_avg4(dst, src+1, halfpel_h, halfpel_v, halfpel_hv, stride, rounding); break; case 8: - interpolate8x8_lowpass_v(dst, src, stride, stride, rounding); + interpolate8x8_lowpass_v(dst, src, stride, rounding); break; case 9: - interpolate8x8_lowpass_v(halfpel_v, src, 8, stride, 16-rounding); - interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, 8, 8, stride, rounding); - interpolate8x8_bilinear2(dst, halfpel_v, halfpel_hv, stride, 8, rounding); + interpolate8x8_lowpass_v(halfpel_v, src, stride, rounding); + interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); + interpolate8x8_avg2(dst, halfpel_v, halfpel_hv, stride, rounding); break; case 10: - interpolate8x8_lowpass_hv(dst, halfpel_h, src, stride, 8, stride, rounding); + interpolate8x8_lowpass_hv(dst, halfpel_h, src, stride, rounding); break; case 11: - interpolate8x8_lowpass_v(halfpel_v, src+1, 8, stride, 16-rounding); - interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, 8, 8, stride, rounding); - interpolate8x8_bilinear2(dst, halfpel_v, halfpel_hv, stride, 8, rounding); + interpolate8x8_lowpass_v(halfpel_v, src+1, stride, rounding); + interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); + interpolate8x8_avg2(dst, halfpel_v, halfpel_hv, stride, rounding); break; case 12: - interpolate8x8_lowpass_v(halfpel_v, src, 8, stride, rounding); - interpolate8x8_bilinear2(dst, src+stride, halfpel_v, stride, stride, rounding); + interpolate8x8_lowpass_v(halfpel_v, src, stride, rounding); + interpolate8x8_avg2(dst, src+stride, halfpel_v, stride, rounding); break; case 13: - interpolate8x8_lowpass_v(halfpel_v, src, 8, stride, rounding); - interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, 8, 8, stride, rounding); - interpolate8x8_bilinear4(dst, src+stride, halfpel_h+8, halfpel_v, halfpel_hv, stride, rounding); + interpolate8x8_lowpass_v(halfpel_v, src, stride, rounding); + interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); + interpolate8x8_avg4(dst, src+stride, halfpel_h+stride, halfpel_v, halfpel_hv, stride, rounding); break; case 14: - interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, 8, 8, stride, rounding); - interpolate8x8_bilinear2(dst, halfpel_h+8, halfpel_hv, stride, 8, rounding); + interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); + interpolate8x8_avg2(dst, halfpel_h+stride, halfpel_hv, stride, rounding); break; case 15: - interpolate8x8_lowpass_v(halfpel_v, src+1, 8, stride, rounding); - interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, 8, 8, stride, rounding); - interpolate8x8_bilinear4(dst, src+stride+1, halfpel_h+8, halfpel_v, halfpel_hv, stride, rounding); + interpolate8x8_lowpass_v(halfpel_v, src+1, stride, rounding); + interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); + interpolate8x8_avg4(dst, src+stride+1, halfpel_h+stride, halfpel_v, halfpel_hv, stride, rounding); break; } -} \ No newline at end of file +} + +#endif \ No newline at end of file