--- mbprediction.h 2002/06/30 10:46:29 1.11 +++ mbprediction.h 2003/02/21 14:41:23 1.21 @@ -26,18 +26,17 @@ * along with this program; if not, write to the xvid_free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: mbprediction.h,v 1.11 2002/06/30 10:46:29 suxen_drol Exp $ + * $Id: mbprediction.h,v 1.21 2003/02/21 14:41:23 syskin Exp $ * *************************************************************************/ - /****************************************************************************** - * * - * Revision history: * - * * - * 29.06.2002 get_pmvdata() bounding * - * * - ******************************************************************************/ - + /*************************************************************************** + * * + * Revision history: * + * * + * 29.06.2002 get_pmvdata() bounding * + * * + ***************************************************************************/ #ifndef _MBPREDICTION_H_ #define _MBPREDICTION_H_ @@ -55,311 +54,293 @@ #define MVequal(A,B) ( ((A).x)==((B).x) && ((A).y)==((B).y) ) void MBPrediction(FRAMEINFO * frame, /* <-- The parameter for ACDC and MV prediction */ - - uint32_t x_pos, /* <-- The x position of the MB to be searched */ - - uint32_t y_pos, /* <-- The y position of the MB to be searched */ - - uint32_t x_dim, /* <-- Number of macroblocks in a row */ - - int16_t * qcoeff); /* <-> The quantized DCT coefficients */ + uint32_t x_pos, /* <-- The x position of the MB to be searched */ + uint32_t y_pos, /* <-- The y position of the MB to be searched */ + uint32_t x_dim, /* <-- Number of macroblocks in a row */ + int16_t * qcoeff); /* <-> The quantized DCT coefficients */ void add_acdc(MACROBLOCK * pMB, - uint32_t block, - int16_t dct_codes[64], - uint32_t iDcScaler, - int16_t predictors[8]); - + uint32_t block, + int16_t dct_codes[64], + uint32_t iDcScaler, + int16_t predictors[8]); void predict_acdc(MACROBLOCK * pMBs, - uint32_t x, - uint32_t y, - uint32_t mb_width, - uint32_t block, - int16_t qcoeff[64], - uint32_t current_quant, - int32_t iDcScaler, - int16_t predictors[8], + uint32_t x, + uint32_t y, + uint32_t mb_width, + uint32_t block, + int16_t qcoeff[64], + uint32_t current_quant, + int32_t iDcScaler, + int16_t predictors[8], const int bound); - -/* get_pmvdata returns the median predictor and nothing else */ - -static __inline VECTOR -get_pmv(const MACROBLOCK * const pMBs, - const uint32_t x, - const uint32_t y, - const uint32_t x_dim, - const uint32_t block) -{ - - int xin1, xin2, xin3; - int yin1, yin2, yin3; - int vec1, vec2, vec3; - VECTOR lneigh, tneigh, trneigh; /* left neighbour, top neighbour, topright neighbour */ - VECTOR median; - - static VECTOR zeroMV = { 0, 0 }; - uint32_t index = x + y * x_dim; - - /* first row (special case) */ - if (y == 0 && (block == 0 || block == 1)) { - if ((x == 0) && (block == 0)) // first column, first block - { - return zeroMV; - } - if (block == 1) // second block; has only a left neighbour - { - return pMBs[index].mvs[0]; - } else { /* block==0, but x!=0, so again, there is a left neighbour */ - - return pMBs[index - 1].mvs[1]; - } - } - +static const VECTOR zeroMV = { 0, 0 }; /* * MODE_INTER, vm18 page 48 * MODE_INTER4V vm18 page 51 * - * (x,y-1) (x+1,y-1) - * [ | ] [ | ] - * [ 2 | 3 ] [ 2 | ] + * (x,y-1) (x+1,y-1) + * [ | ] [ | ] + * [ 2 | 3 ] [ 2 | ] * - * (x-1,y) (x,y) (x+1,y) - * [ | 1 ] [ 0 | 1 ] [ 0 | ] - * [ | 3 ] [ 2 | 3 ] [ | ] + * (x-1,y) (x,y) (x+1,y) + * [ | 1 ] [ 0 | 1 ] [ 0 | ] + * [ | 3 ] [ 2 | 3 ] [ | ] */ +static __inline VECTOR +get_pmv2(const MACROBLOCK * const mbs, + const int mb_width, + const int bound, + const int x, + const int y, + const int block) +{ + int lx, ly, lz; /* left */ + int tx, ty, tz; /* top */ + int rx, ry, rz; /* top-right */ + int lpos, tpos, rpos; + int num_cand = 0, last_cand = 1; + + VECTOR pmv[4]; /* left neighbour, top neighbour, top-right neighbour */ + switch (block) { case 0: - xin1 = x - 1; - yin1 = y; - vec1 = 1; /* left */ - xin2 = x; - yin2 = y - 1; - vec2 = 2; /* top */ - xin3 = x + 1; - yin3 = y - 1; - vec3 = 2; /* top right */ + lx = x - 1; ly = y; lz = 1; + tx = x; ty = y - 1; tz = 2; + rx = x + 1; ry = y - 1; rz = 2; break; case 1: - xin1 = x; - yin1 = y; - vec1 = 0; - xin2 = x; - yin2 = y - 1; - vec2 = 3; - xin3 = x + 1; - yin3 = y - 1; - vec3 = 2; + lx = x; ly = y; lz = 0; + tx = x; ty = y - 1; tz = 3; + rx = x + 1; ry = y - 1; rz = 2; break; case 2: - xin1 = x - 1; - yin1 = y; - vec1 = 3; - xin2 = x; - yin2 = y; - vec2 = 0; - xin3 = x; - yin3 = y; - vec3 = 1; + lx = x - 1; ly = y; lz = 3; + tx = x; ty = y; tz = 0; + rx = x; ry = y; rz = 1; break; default: - xin1 = x; - yin1 = y; - vec1 = 2; - xin2 = x; - yin2 = y; - vec2 = 0; - xin3 = x; - yin3 = y; - vec3 = 1; + lx = x; ly = y; lz = 2; + tx = x; ty = y; tz = 0; + rx = x; ry = y; rz = 1; + } + + lpos = lx + ly * mb_width; + rpos = rx + ry * mb_width; + tpos = tx + ty * mb_width; + + if (lpos >= bound && lx >= 0) { + num_cand++; + pmv[1] = mbs[lpos].mvs[lz]; + } else pmv[1] = zeroMV; + + if (tpos >= bound) { + num_cand++; + last_cand = 2; + pmv[2] = mbs[tpos].mvs[tz]; + } else pmv[2] = zeroMV; + + if (rpos >= bound && rx < mb_width) { + num_cand++; + last_cand = 3; + pmv[3] = mbs[rpos].mvs[rz]; + } else pmv[3] = zeroMV; + + /* If there're more than one candidate, we return the median vector */ + + if (num_cand > 1) { + /* set median */ + pmv[0].x = + MIN(MAX(pmv[1].x, pmv[2].x), + MIN(MAX(pmv[2].x, pmv[3].x), MAX(pmv[1].x, pmv[3].x))); + pmv[0].y = + MIN(MAX(pmv[1].y, pmv[2].y), + MIN(MAX(pmv[2].y, pmv[3].y), MAX(pmv[1].y, pmv[3].y))); + return pmv[0]; } + return pmv[last_cand]; /* no point calculating median mv */ +} - if (xin1 < 0 || /* yin1 < 0 || */ xin1 >= (int32_t) x_dim) { - lneigh = zeroMV; - } else { - lneigh = pMBs[xin1 + yin1 * x_dim].mvs[vec1]; - } +static __inline VECTOR +get_qpmv2(const MACROBLOCK * const mbs, + const int mb_width, + const int bound, + const int x, + const int y, + const int block) +{ + int lx, ly, lz; /* left */ + int tx, ty, tz; /* top */ + int rx, ry, rz; /* top-right */ + int lpos, tpos, rpos; + int num_cand = 0, last_cand = 1; - if (xin2 < 0 || /* yin2 < 0 || */ xin2 >= (int32_t) x_dim) { - tneigh = zeroMV; - } else { - tneigh = pMBs[xin2 + yin2 * x_dim].mvs[vec2]; - } + VECTOR pmv[4]; /* left neighbour, top neighbour, top-right neighbour */ - if (xin3 < 0 || /* yin3 < 0 || */ xin3 >= (int32_t) x_dim) { - trneigh = zeroMV; - } else { - trneigh = pMBs[xin3 + yin3 * x_dim].mvs[vec3]; + switch (block) { + case 0: + lx = x - 1; ly = y; lz = 1; + tx = x; ty = y - 1; tz = 2; + rx = x + 1; ry = y - 1; rz = 2; + break; + case 1: + lx = x; ly = y; lz = 0; + tx = x; ty = y - 1; tz = 3; + rx = x + 1; ry = y - 1; rz = 2; + break; + case 2: + lx = x - 1; ly = y; lz = 3; + tx = x; ty = y; tz = 0; + rx = x; ry = y; rz = 1; + break; + default: + lx = x; ly = y; lz = 2; + tx = x; ty = y; tz = 0; + rx = x; ry = y; rz = 1; + } + + lpos = lx + ly * mb_width; + rpos = rx + ry * mb_width; + tpos = tx + ty * mb_width; + + if (lpos >= bound && lx >= 0) { + num_cand++; + pmv[1] = mbs[lpos].qmvs[lz]; + } else pmv[1] = zeroMV; + + if (tpos >= bound) { + num_cand++; + last_cand = 2; + pmv[2] = mbs[tpos].qmvs[tz]; + } else pmv[2] = zeroMV; + + if (rpos >= bound && rx < mb_width) { + num_cand++; + last_cand = 3; + pmv[3] = mbs[rpos].qmvs[rz]; + } else pmv[3] = zeroMV; + + /* If there're more than one candidate, we return the median vector */ + + if (num_cand > 1) { + /* set median */ + pmv[0].x = + MIN(MAX(pmv[1].x, pmv[2].x), + MIN(MAX(pmv[2].x, pmv[3].x), MAX(pmv[1].x, pmv[3].x))); + pmv[0].y = + MIN(MAX(pmv[1].y, pmv[2].y), + MIN(MAX(pmv[2].y, pmv[3].y), MAX(pmv[1].y, pmv[3].y))); + return pmv[0]; } - /* median,minimum */ - - median.x = - MIN(MAX(lneigh.x, tneigh.x), - MIN(MAX(tneigh.x, trneigh.x), MAX(lneigh.x, trneigh.x))); - median.y = - MIN(MAX(lneigh.y, tneigh.y), - MIN(MAX(tneigh.y, trneigh.y), MAX(lneigh.y, trneigh.y))); - return median; + return pmv[last_cand]; /* no point calculating median mv */ } - - -int -get_pmvdata2(const MACROBLOCK * const pMBs, - const uint32_t x, - const uint32_t y, - const uint32_t x_dim, - const uint32_t block, - VECTOR * const pmv, - int32_t * const psad, - const int bound); - - -/* This is somehow a copy of get_pmv, but returning all MVs and Minimum SAD - instead of only Median MV */ - -static __inline int -get_pmvdata(const MACROBLOCK * const pMBs, - const uint32_t x, - const uint32_t y, - const uint32_t x_dim, - const uint32_t block, - VECTOR * const pmv, - int32_t * const psad) -{ - /* - * pmv are filled with: + * pmv are filled with: * [0]: Median (or whatever is correct in a special case) * [1]: left neighbour * [2]: top neighbour * [3]: topright neighbour * psad are filled with: * [0]: minimum of [1] to [3] - * [1]: left neighbour's SAD (NB:[1] to [3] are actually not needed) + * [1]: left neighbour's SAD (NB:[1] to [3] are actually not needed) * [2]: top neighbour's SAD * [3]: topright neighbour's SAD */ - int xin1, xin2, xin3; - int yin1, yin2, yin3; - int vec1, vec2, vec3; - - uint32_t index = x + y * x_dim; - const VECTOR zeroMV = { 0, 0 }; - - // first row of blocks (special case) - if (y == 0 && (block == 0 || block == 1)) { - if ((x == 0) && (block == 0)) // first column, first block - { - pmv[0] = pmv[1] = pmv[2] = pmv[3] = zeroMV; - psad[0] = 0; - psad[1] = psad[2] = psad[3] = MV_MAX_ERROR; - return 0; - } - if (block == 1) // second block; has only a left neighbour - { - pmv[0] = pmv[1] = pMBs[index].mvs[0]; - pmv[2] = pmv[3] = zeroMV; - psad[0] = psad[1] = pMBs[index].sad8[0]; - psad[2] = psad[3] = MV_MAX_ERROR; - return 0; - } else { /* block==0, but x!=0, so again, there is a left neighbour */ - - pmv[0] = pmv[1] = pMBs[index - 1].mvs[1]; - pmv[2] = pmv[3] = zeroMV; - psad[0] = psad[1] = pMBs[index - 1].sad8[1]; - psad[2] = psad[3] = MV_MAX_ERROR; - return 0; - } - } - - /* - * MODE_INTER, vm18 page 48 - * MODE_INTER4V vm18 page 51 - * - * (x,y-1) (x+1,y-1) - * [ | ] [ | ] - * [ 2 | 3 ] [ 2 | ] - * - * (x-1,y) (x,y) (x+1,y) - * [ | 1 ] [ 0 | 1 ] [ 0 | ] - * [ | 3 ] [ 2 | 3 ] [ | ] - */ +static __inline int +get_pmvdata2(const MACROBLOCK * const mbs, + const int mb_width, + const int bound, + const int x, + const int y, + const int block, + VECTOR * const pmv, + int32_t * const psad) +{ + int lx, ly, lz; /* left */ + int tx, ty, tz; /* top */ + int rx, ry, rz; /* top-right */ + int lpos, tpos, rpos; + int num_cand = 0, last_cand = 1; switch (block) { case 0: - xin1 = x - 1; - yin1 = y; - vec1 = 1; /* left */ - xin2 = x; - yin2 = y - 1; - vec2 = 2; /* top */ - xin3 = x + 1; - yin3 = y - 1; - vec3 = 2; /* top right */ + lx = x - 1; ly = y; lz = 1; + tx = x; ty = y - 1; tz = 2; + rx = x + 1; ry = y - 1; rz = 2; break; case 1: - xin1 = x; - yin1 = y; - vec1 = 0; - xin2 = x; - yin2 = y - 1; - vec2 = 3; - xin3 = x + 1; - yin3 = y - 1; - vec3 = 2; + lx = x; ly = y; lz = 0; + tx = x; ty = y - 1; tz = 3; + rx = x + 1; ry = y - 1; rz = 2; break; case 2: - xin1 = x - 1; - yin1 = y; - vec1 = 3; - xin2 = x; - yin2 = y; - vec2 = 0; - xin3 = x; - yin3 = y; - vec3 = 1; + lx = x - 1; ly = y; lz = 3; + tx = x; ty = y; tz = 0; + rx = x; ry = y; rz = 1; break; default: - xin1 = x; - yin1 = y; - vec1 = 2; - xin2 = x; - yin2 = y; - vec2 = 0; - xin3 = x; - yin3 = y; - vec3 = 1; + lx = x; ly = y; lz = 2; + tx = x; ty = y; tz = 0; + rx = x; ry = y; rz = 1; } - - if (xin1 < 0 || xin1 >= (int32_t) x_dim) { + lpos = lx + ly * mb_width; + rpos = rx + ry * mb_width; + tpos = tx + ty * mb_width; + + if (lpos >= bound && lx >= 0) { + num_cand++; + last_cand = 1; + pmv[1] = mbs[lpos].mvs[lz]; + psad[1] = mbs[lpos].sad8[lz]; + } else { pmv[1] = zeroMV; psad[1] = MV_MAX_ERROR; - } else { - pmv[1] = pMBs[xin1 + yin1 * x_dim].mvs[vec1]; - psad[1] = pMBs[xin1 + yin1 * x_dim].sad8[vec1]; } - if (xin2 < 0 || xin2 >= (int32_t) x_dim) { + if (tpos >= bound) { + num_cand++; + last_cand = 2; + pmv[2]= mbs[tpos].mvs[tz]; + psad[2] = mbs[tpos].sad8[tz]; + } else { pmv[2] = zeroMV; psad[2] = MV_MAX_ERROR; - } else { - pmv[2] = pMBs[xin2 + yin2 * x_dim].mvs[vec2]; - psad[2] = pMBs[xin2 + yin2 * x_dim].sad8[vec2]; } - if (xin3 < 0 || xin3 >= (int32_t) x_dim) { + if (rpos >= bound && rx < mb_width) { + num_cand++; + last_cand = 3; + pmv[3] = mbs[rpos].mvs[rz]; + psad[3] = mbs[rpos].sad8[rz]; + } else { pmv[3] = zeroMV; psad[3] = MV_MAX_ERROR; - } else { - pmv[3] = pMBs[xin3 + yin3 * x_dim].mvs[vec3]; - psad[3] = pMBs[xin2 + yin2 * x_dim].sad8[vec3]; + } + + /* original pmvdata() compatibility hack */ + if (x == 0 && y == 0 && block == 0) { + pmv[0] = pmv[1] = pmv[2] = pmv[3] = zeroMV; + psad[0] = 0; + psad[1] = psad[2] = psad[3] = MV_MAX_ERROR; + return 0; + } + + /* if only one valid candidate preictor, the invalid candiates are set to the canidate */ + if (num_cand == 1) { + pmv[0] = pmv[last_cand]; + psad[0] = psad[last_cand]; + // return MVequal(pmv[0], zeroMV); /* no point calculating median mv and minimum sad */ + + /* original pmvdata() compatibility hack */ + return y==0 && block <= 1 ? 0 : MVequal(pmv[0], zeroMV); } if ((MVequal(pmv[1], pmv[2])) && (MVequal(pmv[1], pmv[3]))) { @@ -368,7 +349,7 @@ return 1; } - /* median,minimum */ + /* set median, minimum */ pmv[0].x = MIN(MAX(pmv[1].x, pmv[2].x), @@ -376,11 +357,10 @@ pmv[0].y = MIN(MAX(pmv[1].y, pmv[2].y), MIN(MAX(pmv[2].y, pmv[3].y), MAX(pmv[1].y, pmv[3].y))); + psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]); return 0; } - - #endif /* _MBPREDICTION_H_ */