--- mbprediction.h 2002/06/12 20:38:40 1.9 +++ mbprediction.h 2002/06/30 10:46:29 1.11 @@ -26,10 +26,19 @@ * 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.9 2002/06/12 20:38:40 edgomez Exp $ + * $Id: mbprediction.h,v 1.11 2002/06/30 10:46:29 suxen_drol Exp $ * *************************************************************************/ + /****************************************************************************** + * * + * Revision history: * + * * + * 29.06.2002 get_pmvdata() bounding * + * * + ******************************************************************************/ + + #ifndef _MBPREDICTION_H_ #define _MBPREDICTION_H_ @@ -70,7 +79,9 @@ int16_t qcoeff[64], uint32_t current_quant, int32_t iDcScaler, - int16_t predictors[8]); + int16_t predictors[8], + const int bound); + /* get_pmvdata returns the median predictor and nothing else */ @@ -196,6 +207,18 @@ } + +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 */ @@ -231,7 +254,7 @@ // first row of blocks (special case) if (y == 0 && (block == 0 || block == 1)) { - if ((x == 0) && (block == 0)) // first column, first block + if ((x == 0) && (block == 0)) // first column, first block { pmv[0] = pmv[1] = pmv[2] = pmv[3] = zeroMV; psad[0] = 0;