--- trunk/xvidcore/src/motion/motion_comp.c 2002/06/20 14:05:58 229 +++ 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" @@ -7,8 +38,6 @@ #include "../utils/timer.h" #include "motion.h" -#undef BFRAMES - #define ABS(X) (((X)>0)?(X):-(X)) #define SIGN(X) (((X)>0)?1:-1) @@ -101,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, @@ -109,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); @@ -123,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; @@ -199,11 +232,11 @@ const int32_t edged_width = pParam->edged_width; int32_t dx, dy; int32_t b_dx, b_dy; + int k,sum; int x = i; int y = j; - switch (mb->mode) { case MODE_FORWARD: dx = mb->mvs[0].x; @@ -289,61 +322,26 @@ break; - case MODE_INTERPOLATE: + case MODE_INTERPOLATE: /* _could_ use DIRECT, but would be overkill (no 4MV there) */ + dx = mb->mvs[0].x; dy = mb->mvs[0].y; + b_dx = mb->b_mvs[0].x; b_dy = mb->b_mvs[0].y; - transfer_8to16sub2_c(&dct_codes[0 * 64], - cur->y + (i * 16) + (j * 16) * edged_width, - get_ref(f_ref->y, f_refh->y, f_refv->y, - f_refhv->y, 16 * i, 16 * j, 1, dx, dy, - edged_width), get_ref(b_ref->y, b_refh->y, - b_refv->y, - b_refhv->y, 16 * i, - 16 * j, 1, b_dx, - b_dy, edged_width), - edged_width); - - transfer_8to16sub2_c(&dct_codes[1 * 64], - cur->y + (i * 16 + 8) + (j * 16) * edged_width, - get_ref(f_ref->y, f_refh->y, f_refv->y, - f_refhv->y, 16 * i + 8, 16 * j, 1, dx, dy, - edged_width), get_ref(b_ref->y, b_refh->y, - b_refv->y, - b_refhv->y, - 16 * i + 8, 16 * j, - 1, b_dx, b_dy, - edged_width), - edged_width); - - transfer_8to16sub2_c(&dct_codes[2 * 64], - cur->y + (i * 16) + (j * 16 + 8) * edged_width, + for (k=0;k<4;k++) + { + transfer_8to16sub2_c(&dct_codes[k * 64], + cur->y + (i * 16+(k&1)*8) + (j * 16+((k>>1)*8)) * edged_width, get_ref(f_ref->y, f_refh->y, f_refv->y, - f_refhv->y, 16 * i, 16 * j + 8, 1, dx, dy, - edged_width), get_ref(b_ref->y, b_refh->y, - b_refv->y, - b_refhv->y, 16 * i, - 16 * j + 8, 1, b_dx, - b_dy, edged_width), + f_refhv->y, 2*i + (k&1), 2*j + (k>>1), 8, dx, dy, + edged_width), + get_ref(b_ref->y, b_refh->y, b_refv->y, + b_refhv->y, 2*i + (k&1), 2 * j+(k>>1), 8, b_dx, b_dy, + edged_width), edged_width); - - transfer_8to16sub2_c(&dct_codes[3 * 64], - cur->y + (i * 16 + 8) + (j * 16 + - 8) * edged_width, - get_ref(f_ref->y, f_refh->y, f_refv->y, - f_refhv->y, 16 * i + 8, 16 * j + 8, 1, dx, - dy, edged_width), get_ref(b_ref->y, - b_refh->y, - b_refv->y, - b_refhv->y, - 16 * i + 8, - 16 * j + 8, 1, - b_dx, b_dy, - edged_width), - edged_width); - + } dx = (dx & 3) ? (dx >> 1) | 1 : dx / 2; dy = (dy & 3) ? (dy >> 1) | 1 : dy / 2; @@ -354,36 +352,88 @@ transfer_8to16sub2_c(&dct_codes[4 * 64], cur->u + (y * 8) * edged_width / 2 + (x * 8), get_ref(f_ref->u, f_refh->u, f_refv->u, - f_refhv->u, 8 * i, 8 * j, 1, dx, dy, - edged_width / 2), get_ref(b_ref->u, - b_refh->u, - b_refv->u, - b_refhv->u, - 8 * i, 8 * j, 1, - b_dx, b_dy, - edged_width / - 2), + f_refhv->u, i, j, 8, dx, dy, + edged_width / 2), + get_ref(b_ref->u, b_refh->u, b_refv->u, + b_refhv->u, i, j, 8, b_dx, b_dy, + edged_width / 2), edged_width / 2); transfer_8to16sub2_c(&dct_codes[5 * 64], cur->v + (y * 8) * edged_width / 2 + (x * 8), get_ref(f_ref->v, f_refh->v, f_refv->v, f_refhv->v, 8 * i, 8 * j, 1, dx, dy, - edged_width / 2), get_ref(b_ref->v, - b_refh->v, - b_refv->v, - b_refhv->v, - 8 * i, 8 * j, 1, - b_dx, b_dy, - edged_width / - 2), + edged_width / 2), + get_ref(b_ref->v, b_refh->v, b_refv->v, + b_refhv->v, 8 * i, 8 * j, 1, b_dx, b_dy, + edged_width / 2), edged_width / 2); break; - + case MODE_DIRECT: - // todo + + for (k=0;k<4;k++) + { + dx = mb->mvs[k].x; + dy = mb->mvs[k].y; + + b_dx = mb->b_mvs[k].x; + b_dy = mb->b_mvs[k].y; + +// fprintf(stderr,"Direct Vector %d -- %d:%d %d:%d\n",k,dx,dy,b_dx,b_dy); + + transfer_8to16sub2_c(&dct_codes[k * 64], + cur->y + (i*16 + (k&1)*8) + (j*16 + (k>>1)*8 ) * edged_width, + get_ref(f_ref->y, f_refh->y, f_refv->y, f_refhv->y, + 2*i + (k&1), 2*j + (k>>1), 8, dx, dy, + edged_width), + get_ref(b_ref->y, b_refh->y, b_refv->y, b_refhv->y, + 2*i + (k&1), 2*j + (k>>1), 8, b_dx, b_dy, + edged_width), + edged_width); + } + + sum = mb->mvs[0].x + mb->mvs[1].x + mb->mvs[2].x + mb->mvs[3].x; + dx = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2)); + + sum = mb->mvs[0].y + mb->mvs[1].y + mb->mvs[2].y + mb->mvs[3].y; + dy = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2)); + + + sum = mb->b_mvs[0].x + mb->b_mvs[1].x + mb->b_mvs[2].x + mb->b_mvs[3].x; + b_dx = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2)); + + sum = mb->b_mvs[0].y + mb->b_mvs[1].y + mb->b_mvs[2].y + mb->b_mvs[3].y; + b_dy = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2)); + +/* // for QPel don't forget to always do + + if (quarterpel) + sum /= 2; +*/ + + transfer_8to16sub2_c(&dct_codes[4 * 64], + cur->u + (y * 8) * edged_width / 2 + (x * 8), + get_ref(f_ref->u, f_refh->u, f_refv->u, + f_refhv->u, i, j, 8, dx, dy, + edged_width / 2), + get_ref(b_ref->u, b_refh->u, b_refv->u, + b_refhv->u, i, j, 8, b_dx, b_dy, + edged_width / 2), + edged_width / 2); + + transfer_8to16sub2_c(&dct_codes[5 * 64], + cur->v + (y * 8) * edged_width / 2 + (x * 8), + get_ref(f_ref->v, f_refh->v, f_refv->v, + f_refhv->v, i, j, 8, dx, dy, + edged_width / 2), + get_ref(b_ref->v, b_refh->v, b_refv->v, + b_refhv->v, i, j, 8, b_dx, b_dy, + edged_width / 2), + edged_width / 2); + + break; } - }