--- branches/dev-api-4/xvidcore/src/motion/motion_est.h 2003/06/09 13:55:56 1054 +++ branches/dev-api-4/xvidcore/src/motion/motion_est.h 2003/07/13 09:58:44 1084 @@ -21,7 +21,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: motion_est.h,v 1.3.2.9 2003-06-09 13:54:41 edgomez Exp $ + * $Id: motion_est.h,v 1.3.2.13 2003-07-13 09:57:28 syskin Exp $ * ****************************************************************************/ @@ -139,6 +139,7 @@ int16_t * dctSpace; uint32_t iQuant; uint32_t quant_type; + int * cbp; } SearchData; @@ -208,6 +209,7 @@ const IMAGE * const pRefH, const IMAGE * const pRefV, const IMAGE * const pRefHV, + const IMAGE * const pGMC, const uint32_t iLimit); static void @@ -227,8 +229,30 @@ const MACROBLOCK * const prevMBs, MACROBLOCK * const pMB); -static WARPPOINTS -GlobalMotionEst(const MACROBLOCK * const pMBs, +static __inline void +GMEanalyzeMB (const uint8_t * const pCur, + const uint8_t * const pRef, + const uint8_t * const pRefH, + const uint8_t * const pRefV, + const uint8_t * const pRefHV, + const int x, + const int y, + const MBParam * const pParam, + MACROBLOCK * const pMBs, + SearchData * const Data); + +void +GMEanalysis(const MBParam * const pParam, + const FRAMEINFO * const current, + const FRAMEINFO * const reference, + const IMAGE * const pRefH, + const IMAGE * const pRefV, + const IMAGE * const pRefHV); + + + +WARPPOINTS +GlobalMotionEst(MACROBLOCK * const pMBs, const MBParam * const pParam, const FRAMEINFO * const current, const FRAMEINFO * const reference, @@ -236,6 +260,31 @@ const IMAGE * const pRefV, const IMAGE * const pRefHV ); + +int +GlobalMotionEstRefine(WARPPOINTS *const startwp, + MACROBLOCK * const pMBs, + const MBParam * const pParam, + const FRAMEINFO * const current, + const FRAMEINFO * const reference, + const IMAGE * const pCurr, + const IMAGE * const pRef, + const IMAGE * const pRefH, + const IMAGE * const pRefV, + const IMAGE * const pRefHV); + + + + +int +globalSAD(const WARPPOINTS *const wp, + const MBParam * const pParam, + const MACROBLOCK * const pMBs, + const FRAMEINFO * const current, + const IMAGE * const pRef, + const IMAGE * const pCurr, + uint8_t *const GMCblock); + #define iDiamondSize 2 static __inline uint32_t @@ -299,64 +348,73 @@ static int CountMBBitsIntra(const SearchData * const Data); +static int +CountMBBitsGMC(const SearchData * const Data, const IMAGE * const vGMC, const int x, const int y); + int CodeCoeffIntra_CalcBits(const int16_t qcoeff[64], const uint16_t * zigzag); int CodeCoeffInter_CalcBits(const int16_t qcoeff[64], const uint16_t * zigzag); -#define LAMBDA ( (int)(1.0*BITS_MULT) ) +/* one over lambda for R-D mode decision and motion search */ +#define LAMBDA ( (int)(BITS_MULT/1.0) ) static __inline unsigned int Block_CalcBits( int16_t * const coeff, int16_t * const data, + int16_t * const dqcoeff, const uint32_t quant, const int quant_type, uint32_t * cbp, const int block) { int sum; int bits; - const int lambda = LAMBDA*quant*quant; int distortion = 0; int i; fdct(data); - if (quant_type == 0) sum = quant_inter(coeff, data, quant); + if (quant_type) sum = quant_inter(coeff, data, quant); else sum = quant4_inter(coeff, data, quant); if (sum > 0) { *cbp |= 1 << (5 - block); bits = BITS_MULT * CodeCoeffInter_CalcBits(coeff, scan_tables[0]); - } else bits = 0; - if (quant_type == 0) dequant_inter(coeff, coeff, quant); - else dequant4_inter(coeff, coeff, quant); + if (quant_type) dequant_inter(dqcoeff, coeff, quant); + else dequant4_inter(dqcoeff, coeff, quant); - for (i = 0; i < 64; i++) { - distortion += (data[i] - coeff[i])*(data[i] - coeff[i]); + for (i = 0; i < 64; i++) + distortion += (data[i] - dqcoeff[i])*(data[i] - dqcoeff[i]); + + } else { + bits = 0; + for (i = 0; i < 64; i++) + distortion += data[i]*data[i]; } - bits += (BITS_MULT*BITS_MULT*distortion)/lambda; + bits += (LAMBDA*distortion)/(quant*quant); + return bits; } static __inline unsigned int Block_CalcBitsIntra(int16_t * const coeff, int16_t * const data, + int16_t * const dqcoeff, const uint32_t quant, const int quant_type, uint32_t * cbp, const int block, int * dcpred) { int bits, i; - const int lambda = LAMBDA*quant*quant; int distortion = 0; - uint32_t iDcScaler = get_dc_scaler(quant, block > 3); + uint32_t iDcScaler = get_dc_scaler(quant, block < 4); int b_dc; fdct(data); data[0] -= 1024; - if (quant_type == 0) quant_intra(coeff, data, quant, iDcScaler); + if (quant_type) quant_intra(coeff, data, quant, iDcScaler); else quant4_intra(coeff, data, quant, iDcScaler); b_dc = coeff[0]; @@ -365,20 +423,21 @@ *dcpred = b_dc; } - *cbp |= 1 << (5 - block); bits = BITS_MULT*CodeCoeffIntra_CalcBits(coeff, scan_tables[0]); - bits += BITS_MULT*dcy_tab[coeff[0] + 255].len; if (bits != 0) *cbp |= 1 << (5 - block); + if (block < 4) bits += BITS_MULT*dcy_tab[coeff[0] + 255].len; + else bits += BITS_MULT*dcc_tab[coeff[0] + 255].len; + coeff[0] = b_dc; - if (quant_type == 0) dequant_intra(coeff, coeff, quant, iDcScaler); - else dequant4_intra(coeff, coeff, quant, iDcScaler); + if (quant_type) dequant_intra(dqcoeff, coeff, quant, iDcScaler); + else dequant4_intra(dqcoeff, coeff, quant, iDcScaler); for (i = 0; i < 64; i++) { - distortion += (data[i] - coeff[i])*(data[i] - coeff[i]); + distortion += (data[i] - dqcoeff[i])*(data[i] - dqcoeff[i]); } - bits += (BITS_MULT*BITS_MULT*distortion)/lambda; + bits += (LAMBDA*distortion)/(quant*quant); return bits; }