--- interpolate8x8.h 2004/03/22 22:36:23 1.11 +++ interpolate8x8.h 2004/10/17 10:20:15 1.14 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: interpolate8x8.h,v 1.11 2004/03/22 22:36:23 edgomez Exp $ + * $Id: interpolate8x8.h,v 1.14 2004/10/17 10:20:15 edgomez Exp $ * ****************************************************************************/ @@ -73,10 +73,22 @@ typedef INTERPOLATE8X8_6TAP_LOWPASS *INTERPOLATE8X8_6TAP_LOWPASS_PTR; +/* These function do: dst = interpolate(src) */ extern INTERPOLATE8X8_PTR interpolate8x8_halfpel_h; extern INTERPOLATE8X8_PTR interpolate8x8_halfpel_v; extern INTERPOLATE8X8_PTR interpolate8x8_halfpel_hv; +/* These functions do: dst = (dst+interpolate(src) + 1)/2 + * Suitable for direct/interpolated bvop prediction block + * building w/o the need for intermediate interpolated result + * storing/reading + * NB: the rounding applies to the interpolation, but not + * the averaging step which will always use rounding=0 */ +extern INTERPOLATE8X8_PTR interpolate8x8_halfpel_add; +extern INTERPOLATE8X8_PTR interpolate8x8_halfpel_h_add; +extern INTERPOLATE8X8_PTR interpolate8x8_halfpel_v_add; +extern INTERPOLATE8X8_PTR interpolate8x8_halfpel_hv_add; + extern INTERPOLATE8X8_AVG2_PTR interpolate8x8_avg2; extern INTERPOLATE8X8_AVG4_PTR interpolate8x8_avg4; @@ -95,16 +107,30 @@ INTERPOLATE8X8 interpolate8x8_halfpel_h_c; INTERPOLATE8X8 interpolate8x8_halfpel_v_c; INTERPOLATE8X8 interpolate8x8_halfpel_hv_c; +INTERPOLATE8X8 interpolate8x8_halfpel_add_c; +INTERPOLATE8X8 interpolate8x8_halfpel_h_add_c; +INTERPOLATE8X8 interpolate8x8_halfpel_v_add_c; +INTERPOLATE8X8 interpolate8x8_halfpel_hv_add_c; #ifdef ARCH_IS_IA32 INTERPOLATE8X8 interpolate8x8_halfpel_h_mmx; INTERPOLATE8X8 interpolate8x8_halfpel_v_mmx; INTERPOLATE8X8 interpolate8x8_halfpel_hv_mmx; +INTERPOLATE8X8 interpolate8x8_halfpel_add_mmx; +INTERPOLATE8X8 interpolate8x8_halfpel_h_add_mmx; +INTERPOLATE8X8 interpolate8x8_halfpel_v_add_mmx; +INTERPOLATE8X8 interpolate8x8_halfpel_hv_add_mmx; + INTERPOLATE8X8 interpolate8x8_halfpel_h_xmm; INTERPOLATE8X8 interpolate8x8_halfpel_v_xmm; INTERPOLATE8X8 interpolate8x8_halfpel_hv_xmm; +INTERPOLATE8X8 interpolate8x8_halfpel_add_xmm; +INTERPOLATE8X8 interpolate8x8_halfpel_h_add_xmm; +INTERPOLATE8X8 interpolate8x8_halfpel_v_add_xmm; +INTERPOLATE8X8 interpolate8x8_halfpel_hv_add_xmm; + INTERPOLATE8X8 interpolate8x8_halfpel_h_3dn; INTERPOLATE8X8 interpolate8x8_halfpel_v_3dn; INTERPOLATE8X8 interpolate8x8_halfpel_hv_3dn; @@ -120,6 +146,17 @@ INTERPOLATE8X8 interpolate8x8_halfpel_hv_ia64; #endif +#ifdef ARCH_IS_PPC +INTERPOLATE8X8 interpolate8x8_halfpel_h_altivec_c; +INTERPOLATE8X8 interpolate8x8_halfpel_v_altivec_c; +INTERPOLATE8X8 interpolate8x8_halfpel_hv_altivec_c; + +INTERPOLATE8X8 interpolate8x8_halfpel_add_altivec_c; +INTERPOLATE8X8 interpolate8x8_halfpel_h_add_altivec_c; +INTERPOLATE8X8 interpolate8x8_halfpel_v_add_altivec_c; +INTERPOLATE8X8 interpolate8x8_halfpel_hv_add_altivec_c; +#endif + INTERPOLATE8X8_AVG2 interpolate8x8_avg2_c; INTERPOLATE8X8_AVG4 interpolate8x8_avg4_c; @@ -128,6 +165,11 @@ INTERPOLATE8X8_AVG4 interpolate8x8_avg4_mmx; #endif +#ifdef ARCH_IS_PPC +INTERPOLATE8X8_AVG2 interpolate8x8_avg2_altivec_c; +INTERPOLATE8X8_AVG4 interpolate8x8_avg4_altivec_c; +#endif + INTERPOLATE_LOWPASS interpolate8x8_lowpass_h_c; INTERPOLATE_LOWPASS interpolate8x8_lowpass_v_c; @@ -145,6 +187,10 @@ INTERPOLATE8X8_6TAP_LOWPASS interpolate8x8_6tap_lowpass_v_mmx; #endif +#ifdef ARCH_IS_PPC +INTERPOLATE8X8_6TAP_LOWPASS interpolate8x8_6tap_lowpass_h_altivec_c; +#endif + static __inline void interpolate8x8_switch(uint8_t * const cur, const uint8_t * const refn, @@ -175,6 +221,35 @@ } } +static __inline void +interpolate8x8_add_switch(uint8_t * const cur, + 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) +{ + + const uint8_t * const src = refn + (int)((y + (dy>>1)) * stride + x + (dx>>1)); + uint8_t * const dst = cur + (int)(y * stride + x); + + switch (((dx & 1) << 1) + (dy & 1)) { /* ((dx%2)?2:0)+((dy%2)?1:0) */ + case 0: + interpolate8x8_halfpel_add(dst, src, stride, rounding); + break; + case 1: + interpolate8x8_halfpel_v_add(dst, src, stride, rounding); + break; + case 2: + interpolate8x8_halfpel_h_add(dst, src, stride, rounding); + break; + default: + interpolate8x8_halfpel_hv_add(dst, src, stride, rounding); + break; + } +} static __inline void interpolate16x16_switch(uint8_t * const cur, @@ -192,6 +267,21 @@ interpolate8x8_switch(cur, refn, x+8, y+8, dx, dy, stride, rounding); } +static __inline void +interpolate16x16_add_switch(uint8_t * const cur, + 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) +{ + interpolate8x8_add_switch(cur, refn, x, y, dx, dy, stride, rounding); + interpolate8x8_add_switch(cur, refn, x+8, y, dx, dy, stride, rounding); + interpolate8x8_add_switch(cur, refn, x, y+8, dx, dy, stride, rounding); + interpolate8x8_add_switch(cur, refn, x+8, y+8, dx, dy, stride, rounding); +} static __inline void interpolate32x32_switch(uint8_t * const cur, @@ -209,6 +299,21 @@ interpolate16x16_switch(cur, refn, x+16, y+16, dx, dy, stride, rounding); } +static __inline void +interpolate32x32_add_switch(uint8_t * const cur, + 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) +{ + interpolate16x16_add_switch(cur, refn, x, y, dx, dy, stride, rounding); + interpolate16x16_add_switch(cur, refn, x+16, y, dx, dy, stride, rounding); + interpolate16x16_add_switch(cur, refn, x, y+16, dx, dy, stride, rounding); + interpolate16x16_add_switch(cur, refn, x+16, y+16, dx, dy, stride, rounding); +} static __inline uint8_t * interpolate8x8_switch2(uint8_t * const buffer, @@ -239,308 +344,4 @@ 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, - const uint32_t rounding) -{ - const int32_t xRef = x*4 + dx; - 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; - - x_int = xRef/4; - if (xRef < 0 && xRef % 4) - x_int--; - - x_frac = xRef - (4*x_int); - - y_int = yRef/4; - if (yRef < 0 && yRef % 4) - y_int--; - - 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)) { - - case 0: - transfer8x8_copy(dst, src, stride); - break; - - case 1: - interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(dst, src, halfpel_h, stride, rounding, 8); - break; - - case 2: - interpolate8x8_lowpass_h(dst, src, stride, rounding); - break; - - case 3: - interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(dst, src + 1, halfpel_h, stride, rounding, 8); - break; - - case 4: - interpolate8x8_lowpass_v(halfpel_v, src, stride, rounding); - interpolate8x8_avg2(dst, src, halfpel_v, stride, rounding, 8); - break; - - case 5: - interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9); - interpolate8x8_lowpass_v(halfpel_hv, halfpel_v, stride, rounding); - interpolate8x8_avg2(dst, halfpel_v, halfpel_hv, stride, rounding, 8); - break; - - case 6: - interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); - interpolate8x8_avg2(dst, halfpel_h, halfpel_hv, stride, rounding, 8); - break; - - case 7: - interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src + 1, halfpel_h, stride, rounding, 9); - interpolate8x8_lowpass_v(halfpel_hv, halfpel_v, stride, rounding); - interpolate8x8_avg2(dst, halfpel_v, halfpel_hv, stride, rounding, 8); - break; - - case 8: - interpolate8x8_lowpass_v(dst, src, stride, rounding); - break; - - case 9: - interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9); - interpolate8x8_lowpass_v(dst, halfpel_v, stride, rounding); - break; - - case 10: - interpolate8x8_lowpass_hv(dst, halfpel_h, src, stride, rounding); - break; - - case 11: - interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src + 1, halfpel_h, stride, rounding, 9); - interpolate8x8_lowpass_v(dst, halfpel_v, stride, rounding); - break; - - case 12: - interpolate8x8_lowpass_v(halfpel_v, src, stride, rounding); - interpolate8x8_avg2(dst, src+stride, halfpel_v, stride, rounding, 8); - break; - - case 13: - interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9); - interpolate8x8_lowpass_v(halfpel_hv, halfpel_v, stride, rounding); - interpolate8x8_avg2(dst, halfpel_v+stride, halfpel_hv, stride, rounding, 8); - break; - - case 14: - interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); - interpolate8x8_avg2(dst, halfpel_h+stride, halfpel_hv, stride, rounding, 8); - break; - - case 15: - interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src + 1, halfpel_h, stride, rounding, 9); - interpolate8x8_lowpass_v(halfpel_hv, halfpel_v, stride, rounding); - interpolate8x8_avg2(dst, halfpel_hv, halfpel_v + stride, stride, rounding, 8); - break; - } -} - -static __inline void interpolate16x16_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, - const uint32_t rounding) -{ - const int32_t xRef = x*4 + dx; - 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; - - x_int = xRef/4; - if (xRef < 0 && xRef % 4) - x_int--; - - x_frac = xRef - (4*x_int); - - y_int = yRef/4; - if (yRef < 0 && yRef % 4) - y_int--; - - 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)) { - - case 0: - transfer16x16_copy(dst, src, stride); - break; - - case 1: - interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(dst, src, halfpel_h, stride, rounding, 8); - interpolate8x8_avg2(dst+8, src+8, halfpel_h+8, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride, src+8*stride, halfpel_h+8*stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride+8, src+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 8); - break; - - case 2: - interpolate16x16_lowpass_h(dst, src, stride, rounding); - break; - - case 3: - interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(dst, src + 1, halfpel_h, stride, rounding, 8); - interpolate8x8_avg2(dst+8, src + 8 + 1, halfpel_h+8, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride, src + 8*stride + 1, halfpel_h+8*stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride+8, src+8*stride+8 + 1, halfpel_h+8*stride+8, stride, rounding, 8); - break; - - case 4: - interpolate16x16_lowpass_v(halfpel_v, src, stride, rounding); - interpolate8x8_avg2(dst, src, halfpel_v, stride, rounding, 8); - interpolate8x8_avg2(dst+8, src+8, halfpel_v+8, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride, src+8*stride, halfpel_v+8*stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride+8, src+8*stride+8, halfpel_v+8*stride+8, stride, rounding, 8); - break; - - case 5: - interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8, src + 8, halfpel_h+8, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride, src + 8*stride, halfpel_h+8*stride, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride+8, src+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9); - - interpolate16x16_lowpass_v(halfpel_hv, halfpel_v, stride, rounding); - interpolate8x8_avg2(dst, halfpel_hv, halfpel_v, stride, rounding, 8); - interpolate8x8_avg2(dst+8, halfpel_hv+8, halfpel_v+8, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride, halfpel_hv+8*stride, halfpel_v+8*stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride+8, halfpel_hv+8*stride+8, halfpel_v+8*stride+8, stride, rounding, 8); - break; - - case 6: - interpolate16x16_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); - interpolate8x8_avg2(dst, halfpel_h, halfpel_hv, stride, rounding, 8); - interpolate8x8_avg2(dst+8, halfpel_h+8, halfpel_hv+8, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride, halfpel_h+8*stride, halfpel_hv+8*stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride+8, halfpel_h+8*stride+8, halfpel_hv+8*stride+8, stride, rounding, 8); - break; - - case 7: - interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src+1, halfpel_h, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8, src+1 + 8, halfpel_h+8, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride, src+1 + 8*stride, halfpel_h+8*stride, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride+8, src+1+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9); - - interpolate16x16_lowpass_v(halfpel_hv, halfpel_v, stride, rounding); - interpolate8x8_avg2(dst, halfpel_hv, halfpel_v, stride, rounding, 8); - interpolate8x8_avg2(dst+8, halfpel_hv+8, halfpel_v+8, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride, halfpel_hv+8*stride, halfpel_v+8*stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride+8, halfpel_hv+8*stride+8, halfpel_v+8*stride+8, stride, rounding, 8); - break; - - case 8: - interpolate16x16_lowpass_v(dst, src, stride, rounding); - break; - - case 9: - interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8, src + 8, halfpel_h+8, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride, src + 8*stride, halfpel_h+8*stride, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride+8, src+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9); - interpolate16x16_lowpass_v(dst, halfpel_v, stride, rounding); - break; - - case 10: - interpolate16x16_lowpass_hv(dst, halfpel_h, src, stride, rounding); - break; - - case 11: - interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src+1, halfpel_h, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8, src+1 + 8, halfpel_h+8, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride, src+1 + 8*stride, halfpel_h+8*stride, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride+8, src+1+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9); - interpolate16x16_lowpass_v(dst, halfpel_v, stride, rounding); - break; - - case 12: - interpolate16x16_lowpass_v(halfpel_v, src, stride, rounding); - interpolate8x8_avg2(dst, src+stride, halfpel_v, stride, rounding, 8); - interpolate8x8_avg2(dst+8, src+stride+8, halfpel_v+8, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride, src+stride+8*stride, halfpel_v+8*stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride+8, src+stride+8*stride+8, halfpel_v+8*stride+8, stride, rounding, 8); - break; - - case 13: - interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8, src + 8, halfpel_h+8, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride, src + 8*stride, halfpel_h+8*stride, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride+8, src+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9); - - interpolate16x16_lowpass_v(halfpel_hv, halfpel_v, stride, rounding); - interpolate8x8_avg2(dst, halfpel_hv, halfpel_v+stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8, halfpel_hv+8, halfpel_v+stride+8, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride, halfpel_hv+8*stride, halfpel_v+stride+8*stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride+8, halfpel_hv+8*stride+8, halfpel_v+stride+8*stride+8, stride, rounding, 8); - break; - - case 14: - interpolate16x16_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding); - interpolate8x8_avg2(dst, halfpel_h+stride, halfpel_hv, stride, rounding, 8); - interpolate8x8_avg2(dst+8, halfpel_h+stride+8, halfpel_hv+8, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride, halfpel_h+stride+8*stride, halfpel_hv+8*stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride+8, halfpel_h+stride+8*stride+8, halfpel_hv+8*stride+8, stride, rounding, 8); - break; - - case 15: - interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding); - interpolate8x8_avg2(halfpel_v, src+1, halfpel_h, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8, src+1 + 8, halfpel_h+8, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride, src+1 + 8*stride, halfpel_h+8*stride, stride, rounding, 9); - interpolate8x8_avg2(halfpel_v+8*stride+8, src+1+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9); - - interpolate16x16_lowpass_v(halfpel_hv, halfpel_v, stride, rounding); - interpolate8x8_avg2(dst, halfpel_hv, halfpel_v+stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8, halfpel_hv+8, halfpel_v+stride+8, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride, halfpel_hv+8*stride, halfpel_v+stride+8*stride, stride, rounding, 8); - interpolate8x8_avg2(dst+8*stride+8, halfpel_hv+8*stride+8, halfpel_v+stride+8*stride+8, stride, rounding, 8); - break; - } -} - #endif