--- interpolate8x8.h 2002/12/08 05:33:42 1.5.2.8 +++ interpolate8x8.h 2003/06/09 13:54:07 1.10.2.2 @@ -1,3 +1,28 @@ +/***************************************************************************** + * + * XVID MPEG-4 VIDEO CODEC + * - Interpolation related header - + * + * Copyright(C) 2001-2003 Peter Ross + * + * This program is free software ; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation ; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY ; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * 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.10.2.2 2003/06/09 13:54:07 edgomez Exp $ + * + ****************************************************************************/ + #ifndef _INTERPOLATE8X8_H_ #define _INTERPOLATE8X8_H_ @@ -83,6 +108,10 @@ INTERPOLATE8X8 interpolate8x8_halfpel_v_3dn; INTERPOLATE8X8 interpolate8x8_halfpel_hv_3dn; +INTERPOLATE8X8 interpolate8x8_halfpel_h_3dne; +INTERPOLATE8X8 interpolate8x8_halfpel_v_3dne; +INTERPOLATE8X8 interpolate8x8_halfpel_hv_3dne; + INTERPOLATE8X8 interpolate8x8_halfpel_h_ia64; INTERPOLATE8X8 interpolate8x8_halfpel_v_ia64; INTERPOLATE8X8 interpolate8x8_halfpel_hv_ia64; @@ -120,7 +149,7 @@ { int32_t ddx, ddy; - switch (((dx & 1) << 1) + (dy & 1)) // ((dx%2)?2:0)+((dy%2)?1:0) + switch (((dx & 1) << 1) + (dy & 1)) /* ((dx%2)?2:0)+((dy%2)?1:0) */ { case 0: ddx = dx / 2; @@ -202,7 +231,7 @@ { int32_t ddx, ddy; - switch (((dx & 1) << 1) + (dy & 1)) // ((dx%2)?2:0)+((dy%2)?1:0) + 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); @@ -399,10 +428,7 @@ switch((y_frac << 2) | (x_frac)) { case 0: - transfer8x8_copy(dst, src, stride); - transfer8x8_copy(dst+8, src+8, stride); - transfer8x8_copy(dst+8*stride, src+8*stride, stride); - transfer8x8_copy(dst+8*stride+8, src+8*stride+8, stride); + transfer16x16_copy(dst, src, stride); break; case 1: @@ -540,4 +566,5 @@ break; } } + #endif