--- gmc.h 2003/09/11 15:29:32 1.1.2.4 +++ gmc.h 2003/09/30 18:20:31 1.1.2.5 @@ -19,7 +19,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: gmc.h,v 1.1.2.4 2003/09/11 15:29:32 syskin Exp $ + * $Id: gmc.h,v 1.1.2.5 2003/09/30 18:20:31 edgomez Exp $ * ****************************************************************************/ @@ -32,7 +32,9 @@ { int length = 1 << (fcode+4); - // if (quarterpel) value *= 2; +#if 0 + if (quarterpel) value *= 2; +#endif if (value < -length) return -length; @@ -81,12 +83,14 @@ }; #undef MLT -////////////////////////////////////////////////////////// -// Pts = 2 or 3 -// Warning! *src is the global frame pointer (that is: adress -// of pixel 0,0), not the macroblock one. -// Conversely, *dst is the macroblock top-left adress. +/* ************************************************************ + * Pts = 2 or 3 + * + * Warning! *src is the global frame pointer (that is: adress + * of pixel 0,0), not the macroblock one. + * Conversely, *dst is the macroblock top-left adress. + */ void Predict_16x16_C(const NEW_GMC_DATA * const This, uint8_t *dst, const uint8_t *src, @@ -100,8 +104,9 @@ void get_average_mv_C(const NEW_GMC_DATA * const Dsp, VECTOR * const mv, int x, int y, int qpel); -/* ************************************************************ */ -// simplified version for 1 warp point +/* ************************************************************ + * simplified version for 1 warp point + */ void Predict_1pt_16x16_C(const NEW_GMC_DATA * const This, uint8_t *Dst, const uint8_t *Src, @@ -115,30 +120,29 @@ void get_average_mv_1pt_C(const NEW_GMC_DATA * const Dsp, VECTOR * const mv, int x, int y, int qpel); -/* ************************************************************* */ - - - // Warning! It's Accuracy being passed, not 'resolution'! +/* ************************************************************* + * Warning! It's Accuracy being passed, not 'resolution'! + */ void generate_GMCparameters(int nb_pts, const int accuracy, const WARPPOINTS *const pts, const int width, const int height, NEW_GMC_DATA *const gmc); -/* ******************************************************************* */ - +/* ******************************************************************* + */ void -generate_GMCimage( const NEW_GMC_DATA *const gmc_data, // [input] precalculated data - const IMAGE *const pRef, // [input] +generate_GMCimage( const NEW_GMC_DATA *const gmc_data, /* [input] precalculated data */ + const IMAGE *const pRef, /* [input] */ const int mb_width, const int mb_height, const int stride, const int stride2, - const int fcode, // [input] some parameters... - const int32_t quarterpel, // [input] for rounding avgMV - const int reduced_resolution, // [input] ignored - const int32_t rounding, // [input] for rounding image data - MACROBLOCK *const pMBs, // [output] average motion vectors - IMAGE *const pGMC); // [output] full warped image + const int fcode, /* [input] some parameters... */ + const int32_t quarterpel, /* [input] for rounding avgMV */ + const int reduced_resolution, /* [input] ignored */ + const int32_t rounding, /* [input] for rounding image data */ + MACROBLOCK *const pMBs, /* [output] average motion vectors */ + IMAGE *const pGMC); /* [output] full warped image */