--- trunk/xvidcore/src/motion/motion_comp.c 2002/07/25 00:43:19 341 +++ trunk/xvidcore/src/motion/motion_comp.c 2002/09/06 16:59:47 430 @@ -1,5 +1,36 @@ -// 01.05.2002 updated MBMotionCompensationBVOP -// 14.04.2002 bframe compensation +/***************************************************************************** + * + * XVID MPEG-4 VIDEO CODEC + * - Motion Compensation module - + * + * Copyright(C) 2002 Michael Militzer + * Copyright(C) 2002 Edouard Gomez + * Copyright(C) 2002 Christoph Lampert + * + * This program is an implementation of a part of one or more MPEG-4 + * Video tools as specified in ISO/IEC 14496-2 standard. Those intending + * to use this software module in hardware or software products are + * advised that its use may infringe existing patents or copyrights, and + * any such use would be at such party's own risk. The original + * developer of this software module and his/her company, and subsequent + * editors and their companies, will have no liability for use of this + * software or modifications or derivatives thereof. + * + * 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 + * + *************************************************************************/ #include "../encoder.h" #include "../utils/mbfunctions.h" @@ -99,6 +130,7 @@ dy = (dy & 3) ? (dy >> 1) | 1 : dy / 2; /* uv-image-based compensation */ +/* Always do block-based compensation, until check for HALFPEL is possible #ifdef BFRAMES compensate8x8_halfpel(&dct_codes[4 * 64], cur->u, ref->u, refh->u, refv->u, refhv->u, 8 * i, 8 * j, dx, dy, @@ -107,6 +139,7 @@ refv->v, refhv->v, 8 * i, 8 * j, dx, dy, edged_width / 2); #else +*/ /* uv-block-based compensation */ interpolate8x8_switch(refv->u, ref->u, 8 * i, 8 * j, dx, dy, edged_width / 2, rounding); @@ -121,7 +154,9 @@ cur->v + 8 * j * edged_width / 2 + 8 * i, refv->v + 8 * j * edged_width / 2 + 8 * i, edged_width / 2); +/* #endif +*/ } else // mode == MODE_INTER4V { int32_t sum, dx, dy;