--- trunk/xvidcore/src/motion/motion_est.c 2002/09/21 11:59:22 504 +++ trunk/xvidcore/src/motion/motion_est.c 2002/11/26 23:44:11 677 @@ -4,20 +4,12 @@ * - Motion Estimation module - * * Copyright(C) 2002 Christoph Lampert - * Copyright(C) 2002 Michael Militzer - * Copyright(C) 2002 Edouard Gomez + * 2002 Michael Militzer * - * 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 file is part of XviD, a free MPEG-4 video encoder/decoder * - * 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 + * XviD 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. * @@ -30,6 +22,37 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Under section 8 of the GNU General Public License, the copyright + * holders of XVID explicitly forbid distribution in the following + * countries: + * + * - Japan + * - United States of America + * + * Linking XviD statically or dynamically with other modules is making a + * combined work based on XviD. Thus, the terms and conditions of the + * GNU General Public License cover the whole combination. + * + * As a special exception, the copyright holders of XviD give you + * permission to link XviD with independent modules that communicate with + * XviD solely through the VFW1.1 and DShow interfaces, regardless of the + * license terms of these independent modules, and to copy and distribute + * the resulting combined work under terms of your choice, provided that + * every copy of the combined work is accompanied by a complete copy of + * the source code of XviD (the version of XviD used to produce the + * combined work), being distributed under the terms of the GNU General + * Public License plus this exception. An independent module is a module + * which is not derived from or based on XviD. + * + * Note that people who make modified versions of XviD are not obligated + * to grant this special exception for their modified versions; it is + * their choice whether to do so. The GNU General Public License gives + * permission to release a modified version without this exception; this + * exception also makes it possible to release a modified version which + * carries forward this exception. + * + * $Id: motion_est.c,v 1.54 2002-11-26 23:44:10 edgomez Exp $ + * *************************************************************************/ #include @@ -66,7 +89,7 @@ -// mv.length table +/* mv.length table */ static const uint32_t mvtab[33] = { 1, 2, 3, 4, 6, 7, 7, 7, 9, 9, 9, 10, 10, 10, 10, 10, @@ -722,7 +745,7 @@ do { iDirection = 0; - if (bDirection & 1) //we only want to check left if we came from the right (our last motion was to the left, up-left or down-left) + if (bDirection & 1) /*we only want to check left if we came from the right (our last motion was to the left, up-left or down-left) */ CHECK_MV16_CANDIDATE_DIR(start_x - iDiamondSize, start_y, 1); if (bDirection & 2) @@ -736,17 +759,17 @@ /* now we're doing diagonal checks near our candidate */ - if (iDirection) //checking if anything found + if (iDirection) /*checking if anything found */ { bDirection = iDirection; iDirection = 0; start_x = currMV->x; start_y = currMV->y; - if (bDirection & 3) //our candidate is left or right + if (bDirection & 3) /*our candidate is left or right */ { CHECK_MV16_CANDIDATE_DIR(start_x, start_y + iDiamondSize, 8); CHECK_MV16_CANDIDATE_DIR(start_x, start_y - iDiamondSize, 4); - } else // what remains here is up or down + } else /* what remains here is up or down */ { CHECK_MV16_CANDIDATE_DIR(start_x + iDiamondSize, start_y, 2); CHECK_MV16_CANDIDATE_DIR(start_x - iDiamondSize, start_y, 1); @@ -757,7 +780,7 @@ start_x = currMV->x; start_y = currMV->y; } - } else //about to quit, eh? not so fast.... + } else /*about to quit, eh? not so fast.... */ { switch (bDirection) { case 2: @@ -817,7 +840,7 @@ CHECK_MV16_CANDIDATE_DIR(start_x - iDiamondSize, start_y + iDiamondSize, 1 + 8); break; - default: //1+2+4+8 == we didn't find anything at all + default: /*1+2+4+8 == we didn't find anything at all */ CHECK_MV16_CANDIDATE_DIR(start_x - iDiamondSize, start_y - iDiamondSize, 1 + 4); CHECK_MV16_CANDIDATE_DIR(start_x - iDiamondSize, @@ -829,7 +852,7 @@ break; } if (!iDirection) - break; //ok, the end. really + break; /*ok, the end. really */ else { bDirection = iDirection; start_x = currMV->x; @@ -837,262 +860,12 @@ } } } - while (1); //forever + while (1); /*forever */ } return iMinSAD; } -/* Disabled bframe specific code */ -#if 0 - -#define CHECK_MV16_F_INTERPOL(X,Y) { \ - if ( ((X) <= f_max_dx) && ((X) >= f_min_dx) \ - && ((Y) <= f_max_dy) && ((Y) >= f_min_dy) ) \ - { \ - iSAD = sad16bi( cur, \ - get_ref(f_pRef, f_pRefH, f_pRefV, f_pRefHV, x, y, 16, X, Y, iEdgedWidth), \ - get_ref(b_pRef, b_pRefH, b_pRefV, b_pRefHV, x, y, 16, b_currMV->x, b_currMV->y, iEdgedWidth), \ - iEdgedWidth); \ - iSAD += calc_delta_16((X) - f_center_x, (Y) - f_center_y, (uint8_t)f_iFcode, iQuant);\ - iSAD += calc_delta_16(b_currMV->x - b_center_x, b_currMV->y - b_center_y, (uint8_t)b_iFcode, iQuant);\ - if (iSAD < iMinSAD) \ - { iMinSAD=iSAD; f_currMV->x=(X); f_currMV->y=(Y); } } \ -} - -#define CHECK_MV16_F_INTERPOL_FOUND(X,Y) { \ - if ( ((X) <= f_max_dx) && ((X) >= f_min_dx) \ - && ((Y) <= f_max_dy) && ((Y) >= f_min_dy) ) \ - { \ - iSAD = sad16bi( cur, \ - get_ref(f_pRef, f_pRefH, f_pRefV, f_pRefHV, x, y, 16, X, Y, iEdgedWidth), \ - get_ref(b_pRef, b_pRefH, b_pRefV, b_pRefHV, x, y, 16, b_currMV->x, b_currMV->y, iEdgedWidth), \ - iEdgedWidth); \ - iSAD += calc_delta_16((X) - f_center_x, (Y) - f_center_y, (uint8_t)f_iFcode, iQuant);\ - iSAD += calc_delta_16(b_currMV->x - b_center_x, b_currMV->y - b_center_y, (uint8_t)b_iFcode, iQuant);\ - if (iSAD < iMinSAD) \ - { iMinSAD=iSAD; f_currMV->x=(X); f_currMV->y=(Y); iFound=0;} } \ -} - -#define CHECK_MV16_B_INTERPOL(X,Y) { \ - if ( ((X) <= b_max_dx) && ((X) >= b_min_dx) \ - && ((Y) <= b_max_dy) && ((Y) >= b_min_dy) ) \ - { \ - iSAD = sad16bi( cur, \ - get_ref(f_pRef, f_pRefH, f_pRefV, f_pRefHV, x, y, 16, f_currMV->x, f_currMV->y, iEdgedWidth), \ - get_ref(b_pRef, b_pRefH, b_pRefV, b_pRefHV, x, y, 16, X, Y, iEdgedWidth), \ - iEdgedWidth); \ - iSAD += calc_delta_16(f_currMV->x - f_center_x, f_currMV->y - f_center_y, (uint8_t)f_iFcode, iQuant);\ - iSAD += calc_delta_16((X) - b_center_x, (Y) - b_center_y, (uint8_t)b_iFcode, iQuant);\ - if (iSAD < iMinSAD) \ - { iMinSAD=iSAD; b_currMV->x=(X); b_currMV->y=(Y); } } \ -} - -#define CHECK_MV16_B_INTERPOL_FOUND(X,Y) { \ - if ( ((X) <= b_max_dx) && ((X) >= b_min_dx) \ - && ((Y) <= b_max_dy) && ((Y) >= b_min_dy) ) \ - { \ - iSAD = sad16bi( cur, \ - get_ref(f_pRef, f_pRefH, f_pRefV, f_pRefHV, x, y, 16, f_currMV->x, f_currMV->y, iEdgedWidth), \ - get_ref(b_pRef, b_pRefH, b_pRefV, b_pRefHV, x, y, 16, X, Y, iEdgedWidth), \ - iEdgedWidth); \ - iSAD += calc_delta_16(f_currMV->x - f_center_x, f_currMV->y - f_center_y, (uint8_t)f_iFcode, iQuant);\ - iSAD += calc_delta_16((X) - b_center_x, (Y) - b_center_y, (uint8_t)b_iFcode, iQuant);\ - if (iSAD < iMinSAD) \ - { iMinSAD=iSAD; b_currMV->x=(X); b_currMV->y=(Y); iFound=0;} } \ -} - - -int32_t -Diamond16_InterpolMainSearch(const uint8_t * const f_pRef, - const uint8_t * const f_pRefH, - const uint8_t * const f_pRefV, - const uint8_t * const f_pRefHV, - - const uint8_t * const cur, - - const uint8_t * const b_pRef, - const uint8_t * const b_pRefH, - const uint8_t * const b_pRefV, - const uint8_t * const b_pRefHV, - - const int x, - const int y, - - const int f_start_x, - const int f_start_y, - const int b_start_x, - const int b_start_y, - - int iMinSAD, - VECTOR * const f_currMV, - VECTOR * const b_currMV, - - const int f_center_x, - const int f_center_y, - const int b_center_x, - const int b_center_y, - - const int32_t f_min_dx, - const int32_t f_max_dx, - const int32_t f_min_dy, - const int32_t f_max_dy, - - const int32_t b_min_dx, - const int32_t b_max_dx, - const int32_t b_min_dy, - const int32_t b_max_dy, - - const int32_t iEdgedWidth, - const int32_t iDiamondSize, - - const int32_t f_iFcode, - const int32_t b_iFcode, - - const int32_t iQuant, - int iFound) -{ -/* Do a diamond search around given starting point, return SAD of best */ - - int32_t iSAD; - - VECTOR f_backupMV; - VECTOR b_backupMV; - - f_currMV->x = f_start_x; - f_currMV->y = f_start_y; - b_currMV->x = b_start_x; - b_currMV->y = b_start_y; - - do - { - iFound = 1; - - f_backupMV = *f_currMV; - - CHECK_MV16_F_INTERPOL_FOUND(f_backupMV.x - iDiamondSize, f_backupMV.y); - CHECK_MV16_F_INTERPOL_FOUND(f_backupMV.x + iDiamondSize, f_backupMV.y); - CHECK_MV16_F_INTERPOL_FOUND(f_backupMV.x, f_backupMV.y - iDiamondSize); - CHECK_MV16_F_INTERPOL_FOUND(f_backupMV.x, f_backupMV.y + iDiamondSize); - - b_backupMV = *b_currMV; - - CHECK_MV16_B_INTERPOL_FOUND(b_backupMV.x - iDiamondSize, b_backupMV.y); - CHECK_MV16_B_INTERPOL_FOUND(b_backupMV.x + iDiamondSize, b_backupMV.y); - CHECK_MV16_B_INTERPOL_FOUND(b_backupMV.x, b_backupMV.y - iDiamondSize); - CHECK_MV16_B_INTERPOL_FOUND(b_backupMV.x, b_backupMV.y + iDiamondSize); - - } while (!iFound); - - return iMinSAD; -} - -/* Sorry, these MACROS really got too large... I'll turn them into function soon! */ - -#define CHECK_MV16_DIRECT_FOUND(X,Y) \ - if ( (X)>=(-32) && (X)<=(31) && ((Y)>=-32) && ((Y)<=31) ) \ - { int k;\ - VECTOR mvs,b_mvs; \ - iSAD = 0;\ - for (k = 0; k < 4; k++) { \ - mvs.x = (int32_t) ((TRB * directmv[k].x) / TRD + (X)); \ - b_mvs.x = (int32_t) (((X) == 0) \ - ? ((TRB - TRD) * directmv[k].x) / TRD \ - : mvs.x - directmv[k].x); \ - \ - mvs.y = (int32_t) ((TRB * directmv[k].y) / TRD + (Y)); \ - b_mvs.y = (int32_t) (((Y) == 0) \ - ? ((TRB - TRD) * directmv[k].y) / TRD \ - : mvs.y - directmv[k].y); \ - \ - if ( (mvs.x <= max_dx) && (mvs.x >= min_dx) \ - && (mvs.y <= max_dy) && (mvs.y >= min_dy) \ - && (b_mvs.x <= max_dx) && (b_mvs.x >= min_dx) \ - && (b_mvs.y <= max_dy) && (b_mvs.y >= min_dy) ) { \ - iSAD += sad8bi( cur + 8*(k&1) + 8*(k>>1)*iEdgedWidth, \ - get_ref(f_pRef, f_pRefH, f_pRefV, f_pRefHV, 2*x+(k&1), 2*y+(k>>1), 8, \ - mvs.x, mvs.y, iEdgedWidth), \ - get_ref(b_pRef, b_pRefH, b_pRefV, b_pRefHV, 2*x+(k&1), 2*y+(k>>1), 8, \ - b_mvs.x, b_mvs.y, iEdgedWidth), \ - iEdgedWidth); \ - } \ - else \ - iSAD = 65535; \ - } \ - iSAD += calc_delta_16((X),(Y), 1, iQuant);\ - if (iSAD < iMinSAD) \ - { iMinSAD=iSAD; currMV->x=(X); currMV->y=(Y); iFound=0; } \ -} - - - -int32_t -Diamond16_DirectMainSearch( - const uint8_t * const f_pRef, - const uint8_t * const f_pRefH, - const uint8_t * const f_pRefV, - const uint8_t * const f_pRefHV, - - const uint8_t * const cur, - - const uint8_t * const b_pRef, - const uint8_t * const b_pRefH, - const uint8_t * const b_pRefV, - const uint8_t * const b_pRefHV, - - const int x, - const int y, - - const int TRB, - const int TRD, - - const int start_x, - const int start_y, - - int iMinSAD, - VECTOR * const currMV, - const VECTOR * const directmv, - - const int32_t min_dx, - const int32_t max_dx, - const int32_t min_dy, - const int32_t max_dy, - - const int32_t iEdgedWidth, - const int32_t iDiamondSize, - - const int32_t iQuant, - int iFound) -{ -/* Do a diamond search around given starting point, return SAD of best */ - - int32_t iSAD; - - VECTOR backupMV; - - currMV->x = start_x; - currMV->y = start_y; - -/* It's one search with full Diamond pattern, and only 3 of 4 for all following diamonds */ - - do - { - iFound = 1; - - backupMV = *currMV; - - CHECK_MV16_DIRECT_FOUND(backupMV.x - iDiamondSize, backupMV.y); - CHECK_MV16_DIRECT_FOUND(backupMV.x + iDiamondSize, backupMV.y); - CHECK_MV16_DIRECT_FOUND(backupMV.x, backupMV.y - iDiamondSize); - CHECK_MV16_DIRECT_FOUND(backupMV.x, backupMV.y + iDiamondSize); - - } while (!iFound); - - return iMinSAD; -} - -#endif /* 0 */ - int32_t AdvDiamond8_MainSearch(const uint8_t * const pRef, const uint8_t * const pRefH, @@ -1133,7 +906,7 @@ do { iDirection = 0; - if (bDirection & 1) //we only want to check left if we came from the right (our last motion was to the left, up-left or down-left) + if (bDirection & 1) /*we only want to check left if we came from the right (our last motion was to the left, up-left or down-left) */ CHECK_MV8_CANDIDATE_DIR(start_x - iDiamondSize, start_y, 1); if (bDirection & 2) @@ -1147,17 +920,17 @@ /* now we're doing diagonal checks near our candidate */ - if (iDirection) //checking if anything found + if (iDirection) /*checking if anything found */ { bDirection = iDirection; iDirection = 0; start_x = currMV->x; start_y = currMV->y; - if (bDirection & 3) //our candidate is left or right + if (bDirection & 3) /*our candidate is left or right */ { CHECK_MV8_CANDIDATE_DIR(start_x, start_y + iDiamondSize, 8); CHECK_MV8_CANDIDATE_DIR(start_x, start_y - iDiamondSize, 4); - } else // what remains here is up or down + } else /* what remains here is up or down */ { CHECK_MV8_CANDIDATE_DIR(start_x + iDiamondSize, start_y, 2); CHECK_MV8_CANDIDATE_DIR(start_x - iDiamondSize, start_y, 1); @@ -1168,7 +941,7 @@ start_x = currMV->x; start_y = currMV->y; } - } else //about to quit, eh? not so fast.... + } else /*about to quit, eh? not so fast.... */ { switch (bDirection) { case 2: @@ -1227,7 +1000,7 @@ CHECK_MV8_CANDIDATE_DIR(start_x - iDiamondSize, start_y + iDiamondSize, 1 + 8); break; - default: //1+2+4+8 == we didn't find anything at all + default: /*1+2+4+8 == we didn't find anything at all */ CHECK_MV8_CANDIDATE_DIR(start_x - iDiamondSize, start_y - iDiamondSize, 1 + 4); CHECK_MV8_CANDIDATE_DIR(start_x - iDiamondSize, @@ -1239,7 +1012,7 @@ break; } if (!(iDirection)) - break; //ok, the end. really + break; /*ok, the end. really */ else { bDirection = iDirection; start_x = currMV->x; @@ -1247,7 +1020,7 @@ } } } - while (1); //forever + while (1); /*forever */ } return iMinSAD; } @@ -1456,11 +1229,11 @@ if ((iMinSAD < 256) || ((MVequal(*currMV, prevMB->mvs[0])) && ((int32_t) iMinSAD < prevMB->sad16))) { - if (iMinSAD < (int)(2 * iQuant)) // high chances for SKIP-mode + if (iMinSAD < (int)(2 * iQuant)) /* high chances for SKIP-mode */ { if (!MVzero(*currMV)) { iMinSAD += MV16_00_BIAS; - CHECK_MV16_ZERO; // (0,0) saves space for letterboxed pictures + CHECK_MV16_ZERO; /* (0,0) saves space for letterboxed pictures */ iMinSAD -= MV16_00_BIAS; } } @@ -1485,9 +1258,9 @@ */ if ((!MVzero(pmv[0])) || (threshB < 1536) || (bPredEq)) - iDiamondSize = 1; // halfpel! + iDiamondSize = 1; /* halfpel! */ else - iDiamondSize = 2; // halfpel! + iDiamondSize = 2; /* halfpel! */ if (!(MotionFlags & PMV_HALFPELDIAMOND16)) iDiamondSize *= 2; @@ -1499,18 +1272,18 @@ If MV is (0,0) subtract offset. */ -// (0,0) is always possible +/* (0,0) is always possible */ if (!MVzero(pmv[0])) CHECK_MV16_ZERO; -// previous frame MV is always possible +/* previous frame MV is always possible */ if (!MVzero(prevMB->mvs[0])) if (!MVequal(prevMB->mvs[0], pmv[0])) CHECK_MV16_CANDIDATE(prevMB->mvs[0].x, prevMB->mvs[0].y); -// left neighbour, if allowed +/* left neighbour, if allowed */ if (!MVzero(pmv[1])) if (!MVequal(pmv[1], prevMB->mvs[0])) @@ -1522,7 +1295,7 @@ CHECK_MV16_CANDIDATE(pmv[1].x, pmv[1].y); } -// top neighbour, if allowed +/* top neighbour, if allowed */ if (!MVzero(pmv[2])) if (!MVequal(pmv[2], prevMB->mvs[0])) if (!MVequal(pmv[2], pmv[0])) @@ -1533,7 +1306,7 @@ } CHECK_MV16_CANDIDATE(pmv[2].x, pmv[2].y); -// top right neighbour, if allowed +/* top right neighbour, if allowed */ if (!MVzero(pmv[3])) if (!MVequal(pmv[3], prevMB->mvs[0])) if (!MVequal(pmv[3], pmv[0])) @@ -1636,7 +1409,7 @@ */ PMVfast16_Terminate_with_Refine: - if (MotionFlags & PMV_HALFPELREFINE16) // perform final half-pel step + if (MotionFlags & PMV_HALFPELREFINE16) /* perform final half-pel step */ iMinSAD = Halfpel16_Refine(pRef, pRefH, pRefV, pRefHV, cur, x, y, currMV, iMinSAD, center_x, center_y, min_dx, max_dx, min_dy, max_dy, @@ -1697,7 +1470,7 @@ if (iDirection) { while (!iFound) { iFound = 1; - backupMV = *currMV; // since iDirection!=0, this is well defined! + backupMV = *currMV; /* since iDirection!=0, this is well defined! */ iDirectionBackup = iDirection; if (iDirectionBackup != 2) @@ -1986,7 +1759,7 @@ VECTOR backupMV; VECTOR startMV; -// const MACROBLOCK * const pMB = pMBs + (x>>1) + (y>>1) * iWcount; +/* const MACROBLOCK * const pMB = pMBs + (x>>1) + (y>>1) * iWcount; */ const MACROBLOCK *const prevMB = prevMBs + (x >> 1) + (y >> 1) * iWcount; int32_t threshA, threshB; @@ -2040,7 +1813,7 @@ */ -// Prepare for main loop +/* Prepare for main loop */ if (MotionFlags & PMV_USESQUARES8) MainSearchPtr = Square8_MainSearch; @@ -2084,9 +1857,9 @@ */ if ((!MVzero(pmv[0])) || (threshB < 1536 / 4) || (bPredEq)) - iDiamondSize = 1; // 1 halfpel! + iDiamondSize = 1; /* 1 halfpel! */ else - iDiamondSize = 2; // 2 halfpel = 1 full pixel! + iDiamondSize = 2; /* 2 halfpel = 1 full pixel! */ if (!(MotionFlags & PMV_HALFPELDIAMOND8)) iDiamondSize *= 2; @@ -2099,17 +1872,17 @@ If MV is (0,0) subtract offset. */ -// the median prediction might be even better than mv16 +/* the median prediction might be even better than mv16 */ if (!MVequal(pmv[0], startMV)) CHECK_MV8_CANDIDATE(center_x, center_y); -// (0,0) if needed +/* (0,0) if needed */ if (!MVzero(pmv[0])) if (!MVzero(startMV)) CHECK_MV8_ZERO; -// previous frame MV if needed +/* previous frame MV if needed */ if (!MVzero(prevMB->mvs[iSubBlock])) if (!MVequal(prevMB->mvs[iSubBlock], startMV)) if (!MVequal(prevMB->mvs[iSubBlock], pmv[0])) @@ -2125,7 +1898,7 @@ goto PMVfast8_Terminate_with_Refine; } -// left neighbour, if allowed and needed +/* left neighbour, if allowed and needed */ if (!MVzero(pmv[1])) if (!MVequal(pmv[1], startMV)) if (!MVequal(pmv[1], prevMB->mvs[iSubBlock])) @@ -2136,7 +1909,7 @@ } CHECK_MV8_CANDIDATE(pmv[1].x, pmv[1].y); } -// top neighbour, if allowed and needed +/* top neighbour, if allowed and needed */ if (!MVzero(pmv[2])) if (!MVequal(pmv[2], startMV)) if (!MVequal(pmv[2], prevMB->mvs[iSubBlock])) @@ -2148,7 +1921,7 @@ } CHECK_MV8_CANDIDATE(pmv[2].x, pmv[2].y); -// top right neighbour, if allowed and needed +/* top right neighbour, if allowed and needed */ if (!MVzero(pmv[3])) if (!MVequal(pmv[3], startMV)) if (!MVequal(pmv[3], prevMB->mvs[iSubBlock])) @@ -2243,7 +2016,7 @@ */ PMVfast8_Terminate_with_Refine: - if (MotionFlags & PMV_HALFPELREFINE8) // perform final half-pel step + if (MotionFlags & PMV_HALFPELREFINE8) /* perform final half-pel step */ iMinSAD = Halfpel8_Refine(pRef, pRefH, pRefV, pRefHV, cur, x, y, currMV, iMinSAD, center_x, center_y, min_dx, max_dx, min_dy, max_dy, @@ -2300,7 +2073,7 @@ static MACROBLOCK *oldMBs = NULL; -// const MACROBLOCK * const pMB = pMBs + x + y * iWcount; +/* const MACROBLOCK * const pMB = pMBs + x + y * iWcount; */ const MACROBLOCK *const prevMB = prevMBs + x + y * iWcount; MACROBLOCK *oldMB = NULL; @@ -2312,7 +2085,7 @@ if (oldMBs == NULL) { oldMBs = (MACROBLOCK *) calloc(iWcount * iHcount, sizeof(MACROBLOCK)); -// fprintf(stderr,"allocated %d bytes for oldMBs\n",iWcount*iHcount*sizeof(MACROBLOCK)); +/* fprintf(stderr,"allocated %d bytes for oldMBs\n",iWcount*iHcount*sizeof(MACROBLOCK)); */ } oldMB = oldMBs + x + y * iWcount; @@ -2336,7 +2109,7 @@ If SAD<=256 goto Step 10. */ -// Prepare for main loop +/* Prepare for main loop */ currMV->x = start_x; currMV->y = start_y; @@ -2365,7 +2138,7 @@ calc_delta_16(currMV->x - center_x, currMV->y - center_y, (uint8_t) iFcode, iQuant); -// thresh1 is fixed to 256 +/* thresh1 is fixed to 256 */ if ((iMinSAD < 256) || ((MVequal(*currMV, prevMB->mvs[0])) && ((int32_t) iMinSAD < prevMB->sad16))) { @@ -2377,11 +2150,11 @@ /************** This is predictor SET B: (0,0), prev.frame MV, neighbours **************/ -// previous frame MV +/* previous frame MV */ CHECK_MV16_CANDIDATE(prevMB->mvs[0].x, prevMB->mvs[0].y); -// set threshhold based on Min of Prediction and SAD of collocated block -// CHECK_MV16 always uses iSAD for the SAD of last vector to check, so now iSAD is what we want +/* set threshhold based on Min of Prediction and SAD of collocated block */ +/* CHECK_MV16 always uses iSAD for the SAD of last vector to check, so now iSAD is what we want */ if ((x == 0) && (y == 0)) { thresh2 = 512; @@ -2391,12 +2164,12 @@ thresh2 = MIN(psad[0], iSAD) * 6 / 5 + 128; } -// MV=(0,0) is often a good choice +/* MV=(0,0) is often a good choice */ CHECK_MV16_ZERO; -// left neighbour, if allowed +/* left neighbour, if allowed */ if (x != 0) { if (!(MotionFlags & PMV_HALFPEL16)) { pmv[1].x = EVEN(pmv[1].x); @@ -2404,7 +2177,7 @@ } CHECK_MV16_CANDIDATE(pmv[1].x, pmv[1].y); } -// top neighbour, if allowed +/* top neighbour, if allowed */ if (y != 0) { if (!(MotionFlags & PMV_HALFPEL16)) { pmv[2].x = EVEN(pmv[2].x); @@ -2412,7 +2185,7 @@ } CHECK_MV16_CANDIDATE(pmv[2].x, pmv[2].y); -// top right neighbour, if allowed +/* top right neighbour, if allowed */ if ((uint32_t) x != (iWcount - 1)) { if (!(MotionFlags & PMV_HALFPEL16)) { pmv[3].x = EVEN(pmv[3].x); @@ -2437,27 +2210,27 @@ /***** predictor SET C: acceleration MV (new!), neighbours in prev. frame(new!) ****/ - backupMV = prevMB->mvs[0]; // collocated MV - backupMV.x += (prevMB->mvs[0].x - oldMB->mvs[0].x); // acceleration X - backupMV.y += (prevMB->mvs[0].y - oldMB->mvs[0].y); // acceleration Y + backupMV = prevMB->mvs[0]; /* collocated MV */ + backupMV.x += (prevMB->mvs[0].x - oldMB->mvs[0].x); /* acceleration X */ + backupMV.y += (prevMB->mvs[0].y - oldMB->mvs[0].y); /* acceleration Y */ CHECK_MV16_CANDIDATE(backupMV.x, backupMV.y); -// left neighbour +/* left neighbour */ if (x != 0) CHECK_MV16_CANDIDATE((prevMB - 1)->mvs[0].x, (prevMB - 1)->mvs[0].y); -// top neighbour +/* top neighbour */ if (y != 0) CHECK_MV16_CANDIDATE((prevMB - iWcount)->mvs[0].x, (prevMB - iWcount)->mvs[0].y); -// right neighbour, if allowed (this value is not written yet, so take it from pMB->mvs +/* right neighbour, if allowed (this value is not written yet, so take it from pMB->mvs */ if ((uint32_t) x != iWcount - 1) CHECK_MV16_CANDIDATE((prevMB + 1)->mvs[0].x, (prevMB + 1)->mvs[0].y); -// bottom neighbour, dito +/* bottom neighbour, dito */ if ((uint32_t) y != iHcount - 1) CHECK_MV16_CANDIDATE((prevMB + iWcount)->mvs[0].x, (prevMB + iWcount)->mvs[0].y); @@ -2527,7 +2300,7 @@ /*************** Choose best MV found **************/ EPZS16_Terminate_with_Refine: - if (MotionFlags & PMV_HALFPELREFINE16) // perform final half-pel step + if (MotionFlags & PMV_HALFPELREFINE16) /* perform final half-pel step */ iMinSAD = Halfpel16_Refine(pRef, pRefH, pRefV, pRefHV, cur, x, y, currMV, iMinSAD, center_x, center_y, min_dx, max_dx, min_dy, max_dy, @@ -2588,7 +2361,7 @@ const int32_t iSubBlock = ((y & 1) << 1) + (x & 1); -// const MACROBLOCK * const pMB = pMBs + (x>>1) + (y>>1) * iWcount; +/* const MACROBLOCK * const pMB = pMBs + (x>>1) + (y>>1) * iWcount; */ const MACROBLOCK *const prevMB = prevMBs + (x >> 1) + (y >> 1) * iWcount; int32_t bPredEq; @@ -2611,7 +2384,6 @@ /* because we might use something like IF (dx>max_dx) THEN dx=max_dx; */ bPredEq = get_pmvdata2(pMBs, iWcount, 0, x >> 1, y >> 1, iSubBlock, pmv, psad); - /* Step 4: Calculate SAD around the Median prediction. MinSAD=SAD If Motion Vector equal to Previous frame motion vector @@ -2619,7 +2391,7 @@ If SAD<=256 goto Step 10. */ -// Prepare for main loop +/* Prepare for main loop */ if (!(MotionFlags & PMV_HALFPEL8)) { @@ -2648,7 +2420,7 @@ (uint8_t) iFcode, iQuant); -// thresh1 is fixed to 256 +/* thresh1 is fixed to 256 */ if (iMinSAD < 256 / 4) { if (MotionFlags & PMV_QUICKSTOP8) goto EPZS8_Terminate_without_Refine; @@ -2659,13 +2431,13 @@ /************** This is predictor SET B: (0,0), prev.frame MV, neighbours **************/ -// MV=(0,0) is often a good choice +/* MV=(0,0) is often a good choice */ CHECK_MV8_ZERO; -// previous frame MV +/* previous frame MV */ CHECK_MV8_CANDIDATE(prevMB->mvs[iSubBlock].x, prevMB->mvs[iSubBlock].y); -// left neighbour, if allowed +/* left neighbour, if allowed */ if (psad[1] != MV_MAX_ERROR) { if (!(MotionFlags & PMV_HALFPEL8)) { pmv[1].x = EVEN(pmv[1].x); @@ -2673,7 +2445,7 @@ } CHECK_MV8_CANDIDATE(pmv[1].x, pmv[1].y); } -// top neighbour, if allowed +/* top neighbour, if allowed */ if (psad[2] != MV_MAX_ERROR) { if (!(MotionFlags & PMV_HALFPEL8)) { pmv[2].x = EVEN(pmv[2].x); @@ -2681,7 +2453,7 @@ } CHECK_MV8_CANDIDATE(pmv[2].x, pmv[2].y); -// top right neighbour, if allowed +/* top right neighbour, if allowed */ if (psad[3] != MV_MAX_ERROR) { if (!(MotionFlags & PMV_HALFPEL8)) { pmv[3].x = EVEN(pmv[3].x); @@ -2691,12 +2463,13 @@ } } -/* // this bias is zero anyway, at the moment! +#if 0 + /* this bias is zero anyway, at the moment! */ - if ( (MVzero(*currMV)) && (!MVzero(pmv[0])) ) // && (iMinSAD <= iQuant * 96) + if ( (MVzero(*currMV)) && (!MVzero(pmv[0])) ) /* && (iMinSAD <= iQuant * 96) */ iMinSAD -= MV8_00_BIAS; -*/ +#endif /* Terminate if MinSAD <= T_2 Terminate if MV[t] == MV[t-1] and MinSAD[t] <= MinSAD[t-1] @@ -2718,7 +2491,7 @@ /* default: use best prediction as starting point for one call of EPZS_MainSearch */ -// there is no EPZS^2 for inter4v at the moment +/* there is no EPZS^2 for inter4v at the moment */ if (MotionFlags & PMV_USESQUARES8) MainSearchPtr = Square8_MainSearch; @@ -2774,7 +2547,7 @@ /*************** Choose best MV found **************/ EPZS8_Terminate_with_Refine: - if (MotionFlags & PMV_HALFPELREFINE8) // perform final half-pel step + if (MotionFlags & PMV_HALFPELREFINE8) /* perform final half-pel step */ iMinSAD = Halfpel8_Refine(pRef, pRefH, pRefV, pRefHV, cur, x, y, currMV, iMinSAD, center_x, center_y, min_dx, max_dx, min_dy, max_dy, @@ -2786,298 +2559,3 @@ currPMV->y = currMV->y - center_y; return iMinSAD; } - - -/* Disabled bframe specific code */ -# if 0 -int32_t -PMVfastIntSearch16(const uint8_t * const pRef, - const uint8_t * const pRefH, - const uint8_t * const pRefV, - const uint8_t * const pRefHV, - const IMAGE * const pCur, - const int x, - const int y, - const int start_x, /* start should be most likely vector */ - const int start_y, - const int center_x, /* center is from where length of MVs is measured */ - const int center_y, - const uint32_t MotionFlags, - const uint32_t iQuant, - const uint32_t iFcode, - const MBParam * const pParam, - const MACROBLOCK * const pMBs, - const MACROBLOCK * const prevMBs, - VECTOR * const currMV, - VECTOR * const currPMV) -{ - const uint32_t iWcount = pParam->mb_width; - const int32_t iWidth = pParam->width; - const int32_t iHeight = pParam->height; - const int32_t iEdgedWidth = pParam->edged_width; - - const uint8_t *cur = pCur->y + x * 16 + y * 16 * iEdgedWidth; - const VECTOR zeroMV = { 0, 0 }; - - int32_t iDiamondSize; - - int32_t min_dx; - int32_t max_dx; - int32_t min_dy; - int32_t max_dy; - - int32_t iFound; - - VECTOR newMV; - VECTOR backupMV; - - VECTOR pmv[4]; - int32_t psad[4]; - - MainSearch16FuncPtr MainSearchPtr; - - MACROBLOCK *const prevMB = (MACROBLOCK *const)prevMBs + x + y * iWcount; - MACROBLOCK *const pMB = (MACROBLOCK *const)(pMBs + x + y * iWcount); - - int32_t threshA, threshB; - int32_t bPredEq; - int32_t iMinSAD, iSAD; - - -/* Get maximum range */ - get_range(&min_dx, &max_dx, &min_dy, &max_dy, x, y, 16, iWidth, iHeight, - iFcode); - -/* we work with abs. MVs, not relative to prediction, so get_range is called relative to 0,0 */ - - if ((x == 0) && (y == 0)) { - threshA = 512; - threshB = 1024; - - bPredEq = 0; - psad[0] = psad[1] = psad[2] = psad[3] = 0; - *currMV = pmv[0] = pmv[1] = pmv[2] = pmv[3] = zeroMV; - - } else { - - bPredEq = get_ipmvdata(pMBs, iWcount, 0, x, y, 0, pmv, psad); - - threshA = psad[0]; - threshB = threshA + 256; - if (threshA < 512) - threshA = 512; - if (threshA > 1024) - threshA = 1024; - if (threshB > 1792) - threshB = 1792; - - *currMV = pmv[0]; /* current best := prediction */ - } - - iFound = 0; - -/* Step 4: Calculate SAD around the Median prediction. - MinSAD=SAD - If Motion Vector equal to Previous frame motion vector - and MinSADx > max_dx) { - currMV->x = EVEN(max_dx); - } - if (currMV->x < min_dx) { - currMV->x = EVEN(min_dx); - } - if (currMV->y > max_dy) { - currMV->y = EVEN(max_dy); - } - if (currMV->y < min_dy) { - currMV->y = EVEN(min_dy); - } - - iMinSAD = - sad16(cur, - get_iref_mv(pRef, x, y, 16, currMV, - iEdgedWidth), iEdgedWidth, MV_MAX_ERROR); - iMinSAD += - calc_delta_16(currMV->x - center_x, currMV->y - center_y, - (uint8_t) iFcode, iQuant); - - if ((iMinSAD < 256) || - ((MVequal(*currMV, prevMB->i_mvs[0])) && - ((int32_t) iMinSAD < prevMB->i_sad16))) { - if (iMinSAD < (int)(2 * iQuant)) // high chances for SKIP-mode - { - if (!MVzero(*currMV)) { - iMinSAD += MV16_00_BIAS; - CHECK_MV16_ZERO; // (0,0) saves space for letterboxed pictures - iMinSAD -= MV16_00_BIAS; - } - } - - if (MotionFlags & PMV_EARLYSTOP16) - goto PMVfastInt16_Terminate_with_Refine; - } - - -/* Step 2 (lazy eval): Calculate Distance= |MedianMVX| + |MedianMVY| where MedianMV is the motion - vector of the median. - If PredEq=1 and MVpredicted = Previous Frame MV, set Found=2 -*/ - - if ((bPredEq) && (MVequal(pmv[0], prevMB->i_mvs[0]))) - iFound = 2; - -/* Step 3 (lazy eval): If Distance>0 or thresb<1536 or PredEq=1 Select small Diamond Search. - Otherwise select large Diamond Search. -*/ - - if ((!MVzero(pmv[0])) || (threshB < 1536) || (bPredEq)) - iDiamondSize = 2; // halfpel units! - else - iDiamondSize = 4; // halfpel units! - -/* - Step 5: Calculate SAD for motion vectors taken from left block, top, top-right, and Previous frame block. - Also calculate (0,0) but do not subtract offset. - Let MinSAD be the smallest SAD up to this point. - If MV is (0,0) subtract offset. -*/ - -// (0,0) is often a good choice - - if (!MVzero(pmv[0])) - CHECK_MV16_ZERO; - -// previous frame MV is always possible - - if (!MVzero(prevMB->i_mvs[0])) - if (!MVequal(prevMB->i_mvs[0], pmv[0])) - CHECK_MV16_CANDIDATE(prevMB->i_mvs[0].x, prevMB->i_mvs[0].y); - -// left neighbour, if allowed - - if (!MVzero(pmv[1])) - if (!MVequal(pmv[1], prevMB->i_mvs[0])) - if (!MVequal(pmv[1], pmv[0])) - CHECK_MV16_CANDIDATE(pmv[1].x, pmv[1].y); - -// top neighbour, if allowed - if (!MVzero(pmv[2])) - if (!MVequal(pmv[2], prevMB->i_mvs[0])) - if (!MVequal(pmv[2], pmv[0])) - if (!MVequal(pmv[2], pmv[1])) - CHECK_MV16_CANDIDATE(pmv[2].x, pmv[2].y); - -// top right neighbour, if allowed - if (!MVzero(pmv[3])) - if (!MVequal(pmv[3], prevMB->i_mvs[0])) - if (!MVequal(pmv[3], pmv[0])) - if (!MVequal(pmv[3], pmv[1])) - if (!MVequal(pmv[3], pmv[2])) - CHECK_MV16_CANDIDATE(pmv[3].x, - pmv[3].y); - - if ((MVzero(*currMV)) && - (!MVzero(pmv[0])) /* && (iMinSAD <= iQuant * 96) */ ) - iMinSAD -= MV16_00_BIAS; - - -/* Step 6: If MinSAD <= thresa goto Step 10. - If Motion Vector equal to Previous frame motion vector and MinSADi_mvs[0]) && - ((int32_t) iMinSAD < prevMB->i_sad16))) { - - if (MotionFlags & PMV_EARLYSTOP16) - goto PMVfastInt16_Terminate_with_Refine; - } - - -/************ (Diamond Search) **************/ -/* - Step 7: Perform Diamond search, with either the small or large diamond. - If Found=2 only examine one Diamond pattern, and afterwards goto step 10 - Step 8: If small diamond, iterate small diamond search pattern until motion vector lies in the center of the diamond. - If center then goto step 10. - Step 9: If large diamond, iterate large diamond search pattern until motion vector lies in the center. - Refine by using small diamond and goto step 10. -*/ - - if (MotionFlags & PMV_USESQUARES16) - MainSearchPtr = Square16_MainSearch; - else if (MotionFlags & PMV_ADVANCEDDIAMOND16) - MainSearchPtr = AdvDiamond16_MainSearch; - else - MainSearchPtr = Diamond16_MainSearch; - - backupMV = *currMV; /* save best prediction, actually only for EXTSEARCH */ - - -/* default: use best prediction as starting point for one call of PMVfast_MainSearch */ - iSAD = - (*MainSearchPtr) (pRef, pRefH, pRefV, pRefHV, cur, x, y, currMV->x, - currMV->y, iMinSAD, &newMV, center_x, center_y, min_dx, max_dx, - min_dy, max_dy, iEdgedWidth, iDiamondSize, iFcode, - iQuant, iFound); - - if (iSAD < iMinSAD) { - *currMV = newMV; - iMinSAD = iSAD; - } - - if (MotionFlags & PMV_EXTSEARCH16) { -/* extended: search (up to) two more times: orignal prediction and (0,0) */ - - if (!(MVequal(pmv[0], backupMV))) { - iSAD = - (*MainSearchPtr) (pRef, pRefH, pRefV, pRefHV, cur, x, y, - pmv[0].x, pmv[0].y, iMinSAD, &newMV, center_x, center_y, - min_dx, max_dx, min_dy, max_dy, iEdgedWidth, - iDiamondSize, iFcode, iQuant, iFound); - - if (iSAD < iMinSAD) { - *currMV = newMV; - iMinSAD = iSAD; - } - } - - if ((!(MVzero(pmv[0]))) && (!(MVzero(backupMV)))) { - iSAD = - (*MainSearchPtr) (pRef, pRefH, pRefV, pRefHV, cur, x, y, 0, 0, - iMinSAD, &newMV, center_x, center_y, min_dx, max_dx, min_dy, - max_dy, iEdgedWidth, iDiamondSize, iFcode, - iQuant, iFound); - - if (iSAD < iMinSAD) { - *currMV = newMV; - iMinSAD = iSAD; - } - } - } - -/* - Step 10: The motion vector is chosen according to the block corresponding to MinSAD. -*/ - -PMVfastInt16_Terminate_with_Refine: - - pMB->i_mvs[0] = pMB->i_mvs[1] = pMB->i_mvs[2] = pMB->i_mvs[3] = pMB->i_mv16 = *currMV; - pMB->i_sad8[0] = pMB->i_sad8[1] = pMB->i_sad8[2] = pMB->i_sad8[3] = pMB->i_sad16 = iMinSAD; - - if (MotionFlags & PMV_HALFPELREFINE16) // perform final half-pel step - iMinSAD = - Halfpel16_Refine(pRef, pRefH, pRefV, pRefHV, cur, x, y, currMV, - iMinSAD, center_x, center_y, min_dx, max_dx, min_dy, max_dy, - iFcode, iQuant, iEdgedWidth); - - pmv[0] = get_pmv2(pMBs, pParam->mb_width, 0, x, y, 0); // get _REAL_ prediction (halfpel possible) - - currPMV->x = currMV->x - center_x; - currPMV->y = currMV->y - center_y; - return iMinSAD; -} -#endif /* 0 */