--- interpolate8x8.c 2002/10/15 22:27:07 1.4.2.3 +++ interpolate8x8.c 2003/01/04 06:14:33 1.4.2.6 @@ -31,6 +31,7 @@ #include "../portab.h" +#include "../global.h" #include "interpolate8x8.h" // function pointers @@ -53,12 +54,12 @@ INTERPOLATE8X8_6TAP_LOWPASS_PTR interpolate8x8_6tap_lowpass_h; INTERPOLATE8X8_6TAP_LOWPASS_PTR interpolate8x8_6tap_lowpass_v; -void interpolate8x8_avg2_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint32_t stride, const uint32_t rounding) +void interpolate8x8_avg2_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint32_t stride, const uint32_t rounding, const uint32_t height) { - int32_t i; + uint32_t i; const int32_t round = 1 - rounding; - for(i = 0; i < 9; i++) + for(i = 0; i < height; i++) { dst[0] = (src1[0] + src2[0] + round) >> 1; dst[1] = (src1[1] + src2[1] + round) >> 1; @@ -167,8 +168,6 @@ * QPEL STUFF STARTS HERE * *************************************************************/ -#define CLIP(X,A,B) (X < A) ? (A) : ((X > B) ? (B) : (X)) - void interpolate8x8_6tap_lowpass_h_c(uint8_t *dst, uint8_t *src, int32_t stride, int32_t rounding) { int32_t i; @@ -421,4 +420,4 @@ interpolate8x8_lowpass_v_c(dst1, dst2, stride, rounding); -} \ No newline at end of file +}