--- global.h 2003/12/08 13:20:59 1.21.2.11 +++ global.h 2003/04/04 22:16:15 1.22 @@ -1,28 +1,3 @@ -/***************************************************************************** - * - * XVID MPEG-4 VIDEO CODEC - * - Global definitions - - * - * Copyright(C) 2002 Michael Militzer - * - * This program is free software ; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation ; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY ; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program ; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: global.h,v 1.21.2.11 2003/12/08 13:20:59 syskin Exp $ - * - ****************************************************************************/ - #ifndef _GLOBAL_H_ #define _GLOBAL_H_ @@ -48,69 +23,34 @@ #define MODE_DIRECT_NONE_MV 4 #define MODE_DIRECT_NO4V 5 - -/* - * vop coding types - * intra, prediction, backward, sprite, not_coded - */ -#define I_VOP 0 -#define P_VOP 1 -#define B_VOP 2 -#define S_VOP 3 -#define N_VOP 4 - -/* convert mpeg-4 coding type i/p/b/s_VOP to XVID_TYPE_xxx */ -static __inline int -coding2type(int coding_type) -{ - return coding_type + 1; -} - -/* convert XVID_TYPE_xxx to bitstream coding type i/p/b/s_VOP */ -static __inline int -type2coding(int xvid_type) -{ - return xvid_type - 1; -} - - -typedef struct -{ - int x; - int y; -} -VECTOR; - - - -typedef struct +typedef struct { VECTOR duv[3]; } WARPPOINTS; -/* save all warping parameters for GMC once and for all, instead of +/* save all warping parameters for GMC once and for all, instead of recalculating for every block. This is needed for encoding&decoding - When switching to incremental calculations, this will get much shorter + When switching to incremental calculations, this will get much shorter */ /* we don't include WARPPOINTS wp here, but in FRAMEINFO itself */ -typedef struct +typedef struct { - int num_wp; /* [input]: 0=none, 1=translation, 2,3 = warping */ - /* a value of -1 means: "structure not initialized!" */ - int s; /* [input]: calc is done with 1/s pel resolution */ + int num_wp; // [input]: 0=none, 1=translation, 2,3 = warping + // a value of -1 means: "structure not initialized!" + int s; // [input]: calc is done with 1/s pel resolution int W; int H; - - int ss; - int smask; - int sigma; - - int r; - int rho; + + int ss; + int smask; + int sigma; + + int r; + int rho; int i0s; int j0s; @@ -118,47 +58,23 @@ int j1s; int i2s; int j2s; - - int i1ss; - int j1ss; - int i2ss; - int j2ss; + + int i1ss; + int j1ss; + int i2ss; + int j2ss; int alpha; int beta; - int Ws; - int Hs; - - int dxF, dyF, dxG, dyG; + int Ws; + int Hs; + + int dxF, dyF, dxG, dyG; int Fo, Go; int cFo, cGo; -} GMC_DATA; +} +GMC_DATA; -typedef struct _NEW_GMC_DATA -{ - /* 0=none, 1=translation, 2,3 = warping - * a value of -1 means: "structure not initialized!" */ - int num_wp; - - /* {0,1,2,3} => {1/2,1/4,1/8,1/16} pel */ - int accuracy; - - /* sprite size * 16 */ - int sW, sH; - - /* gradient, calculated from warp points */ - int dU[2], dV[2], Uo, Vo, Uco, Vco; - - void (*predict_16x16)(const struct _NEW_GMC_DATA * const This, - uint8_t *dst, const uint8_t *src, - int dststride, int srcstride, int x, int y, int rounding); - void (*predict_8x8) (const struct _NEW_GMC_DATA * const This, - uint8_t *uDst, const uint8_t *uSrc, - uint8_t *vDst, const uint8_t *vSrc, - int dststride, int srcstride, int x, int y, int rounding); - void (*get_average_mv)(const struct _NEW_GMC_DATA * const Dsp, VECTOR * const mv, - int x, int y, int qpel); -} NEW_GMC_DATA; typedef struct { @@ -188,40 +104,46 @@ typedef struct { - /* decoder/encoder */ + // decoder/encoder VECTOR mvs[4]; short int pred_values[6][MBPRED_SIZE]; int acpred_directions[6]; int mode; - int quant; /* absolute quant */ + int quant; // absolute quant int field_dct; int field_pred; int field_for_top; int field_for_bot; - /* encoder specific */ + // encoder specific + VECTOR mv16; VECTOR pmvs[4]; - VECTOR qmvs[4]; /* mvs in quarter pixel resolution */ + VECTOR qmvs[4]; // mvs in quarter pixel resolution - int32_t sad8[4]; /* SAD values for inter4v-VECTORs */ - int32_t sad16; /* SAD value for inter-VECTOR */ + int32_t sad8[4]; // SAD values for inter4v-VECTORs + int32_t sad16; // SAD value for inter-VECTOR int dquant; int cbp; - /* bframe stuff */ + // bframe stuff VECTOR b_mvs[4]; VECTOR b_qmvs[4]; - VECTOR amv; /* average motion vectors from GMC */ + int mb_type; + + // stuff for block based ME (needed for Qpel ME) + // backup of last integer ME vectors/sad + + VECTOR amv; // average motion vectors from GMC int32_t mcsel; -/* This structure has become way to big! What to do? Split it up? */ +/* This structure has become way to big! What to do? Split it up? */ } MACROBLOCK; @@ -248,15 +170,14 @@ return quant - 6; } -/* useful macros */ +// useful macros #define MIN(X, Y) ((X)<(Y)?(X):(Y)) #define MAX(X, Y) ((X)>(Y)?(X):(Y)) -/* #define ABS(X) (((X)>0)?(X):-(X)) */ +#define ABS(X) (((X)>0)?(X):-(X)) #define SIGN(X) (((X)>0)?1:-1) #define CLIP(X,AMIN,AMAX) (((X)<(AMIN)) ? (AMIN) : ((X)>(AMAX)) ? (AMAX) : (X)) #define DIV_DIV(a,b) (((a)>0) ? ((a)+((b)>>1))/(b) : ((a)-((b)>>1))/(b)) -#define SWAP(_T_,A,B) { _T_ tmp = A; A = B; B = tmp; } #endif /* _GLOBAL_H_ */