--- mbprediction.h 2002/09/08 17:25:10 1.15 +++ mbprediction.h 2003/02/21 14:41:23 1.21 @@ -26,10 +26,18 @@ * 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.15 2002/09/08 17:25:10 edgomez Exp $ + * $Id: mbprediction.h,v 1.21 2003/02/21 14:41:23 syskin Exp $ * *************************************************************************/ + /*************************************************************************** + * * + * Revision history: * + * * + * 29.06.2002 get_pmvdata() bounding * + * * + ***************************************************************************/ + #ifndef _MBPREDICTION_H_ #define _MBPREDICTION_H_ @@ -45,71 +53,56 @@ #define MVequal(A,B) ( ((A).x)==((B).x) && ((A).y)==((B).y) ) -/***************************************************************************** - * Prototypes - ****************************************************************************/ - 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); - -/***************************************************************************** - * Inlined functions - ****************************************************************************/ - -/* - * 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 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-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) + const int mb_width, + const int bound, + const int x, + const int y, + const int block) { - static const VECTOR zeroMV = { 0, 0 }; - - int lx, ly, lz; /* left */ - int tx, ty, tz; /* top */ - int rx, ry, rz; /* top-right */ - int lpos, tpos, rpos; - int num_cand, last_cand; + 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 */ @@ -135,206 +128,56 @@ rx = x; ry = y; rz = 1; } - lpos = lx + ly * mb_width; - rpos = rx + ry * mb_width; - tpos = tx + ty * mb_width; - last_cand = num_cand = 0; - - if (lpos >= bound && lx >= 0) { - num_cand++; - last_cand = 1; - 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 - * edgomez : the special case "no candidates" is handled the same way - * because all vectors are set to zero. So the median vector - * is {0,0}, and this is exactly the vector we must return - * according to the mpeg4 specs. - */ + 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) { + if (num_cand > 1) { /* set median */ - - pmv[0].x = + 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 */ -} - - - -/* - * 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) - * [2]: top neighbour's SAD - * [3]: topright neighbour's SAD - */ - -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) -{ - static const VECTOR zeroMV = { 0, 0 }; - - int lx, ly, lz; /* left */ - int tx, ty, tz; /* top */ - int rx, ry, rz; /* top-right */ - int lpos, tpos, rpos; - int num_cand, last_cand; - - 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; - last_cand = num_cand = 0; - - 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; - } - - 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; - } - - 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; - } - - /* 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]))) { - pmv[0] = pmv[1]; - psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]); - return 1; - /* compatibility patch */ - //return y==0 && block <= 1 ? 0 : 1; } - /* set median, minimum */ - - 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))); - - psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]); - - return 0; + return pmv[last_cand]; /* no point calculating median mv */ } -/* copies of get_pmv and get_pmvdata for prediction from integer search */ - static __inline VECTOR -get_ipmv(const MACROBLOCK * const mbs, - const int mb_width, - const int bound, - const int x, - const int y, - const int block) +get_qpmv2(const MACROBLOCK * const mbs, + const int mb_width, + const int bound, + const int x, + const int y, + const int block) { - static const VECTOR zeroMV = { 0, 0 }; - - int lx, ly, lz; /* left */ - int tx, ty, tz; /* top */ - int rx, ry, rz; /* top-right */ + int lx, ly, lz; /* left */ + int tx, ty, tz; /* top */ + int rx, ry, rz; /* top-right */ int lpos, tpos, rpos; - int num_cand, last_cand; + int num_cand = 0, last_cand = 1; VECTOR pmv[4]; /* left neighbour, top neighbour, top-right neighbour */ @@ -360,68 +203,71 @@ rx = x; ry = y; rz = 1; } - lpos = lx + ly * mb_width; - rpos = rx + ry * mb_width; - tpos = tx + ty * mb_width; - last_cand = num_cand = 0; - - if (lpos >= bound && lx >= 0) { - num_cand++; - last_cand = 1; - pmv[1] = mbs[lpos].i_mvs[lz]; - } else { - pmv[1] = zeroMV; - } - - if (tpos >= bound) { - num_cand++; - last_cand = 2; - pmv[2] = mbs[tpos].i_mvs[tz]; - } else { - pmv[2] = zeroMV; - } - - if (rpos >= bound && rx < mb_width) { - num_cand++; - last_cand = 3; - pmv[3] = mbs[rpos].i_mvs[rz]; - } else { - pmv[3] = zeroMV; - } + 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 only one valid candidate predictor, the invalid candiates are set to the canidate */ - if (num_cand != 1) { + if (num_cand > 1) { /* set median */ - - pmv[0].x = + 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 */ + return pmv[last_cand]; /* no point calculating median mv */ } + /* + * 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) + * [2]: top neighbour's SAD + * [3]: topright neighbour's SAD + */ + static __inline int -get_ipmvdata(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) +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) { - static const VECTOR zeroMV = { 0, 0 }; - - int lx, ly, lz; /* left */ - int tx, ty, tz; /* top */ - int rx, ry, rz; /* top-right */ - int lpos, tpos, rpos; - int num_cand, last_cand; + 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: @@ -445,56 +291,54 @@ rx = x; ry = y; rz = 1; } - lpos = lx + ly * mb_width; - rpos = rx + ry * mb_width; - tpos = tx + ty * mb_width; - last_cand = num_cand = 0; - - if (lpos >= bound && lx >= 0) { - num_cand++; - last_cand = 1; - pmv[1] = mbs[lpos].i_mvs[lz]; - psad[1] = mbs[lpos].i_sad8[lz]; - } else { - pmv[1] = zeroMV; + 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; - } + } - if (tpos >= bound) { - num_cand++; - last_cand = 2; - pmv[2]= mbs[tpos].i_mvs[tz]; - psad[2] = mbs[tpos].i_sad8[tz]; - } else { - pmv[2] = zeroMV; + 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; - } - - if (rpos >= bound && rx < mb_width) { - num_cand++; - last_cand = 3; - pmv[3] = mbs[rpos].i_mvs[rz]; - psad[3] = mbs[rpos].i_sad8[rz]; - } else { - pmv[3] = zeroMV; + } + + 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; - } + } /* original pmvdata() compatibility hack */ - if (x == 0 && y == 0 && block == 0) - { + 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 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 */ - + // 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); } @@ -503,8 +347,6 @@ pmv[0] = pmv[1]; psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]); return 1; - /* compatibility patch */ - //return y==0 && block <= 1 ? 0 : 1; } /* set median, minimum */ @@ -518,8 +360,7 @@ psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]); - return 0; + return 0; } - #endif /* _MBPREDICTION_H_ */