--- trunk/xvidcore/src/global.h 2002/06/12 20:38:41 195 +++ branches/dev-api-3/xvidcore/src/global.h 2002/12/08 05:38:56 695 @@ -11,7 +11,6 @@ #define MODE_INTER4V 2 #define MODE_INTRA 3 #define MODE_INTRA_Q 4 -#define MODE_STUFFING 7 #define MODE_NOT_CODED 16 /* --- bframe specific --- */ @@ -21,6 +20,7 @@ #define MODE_BACKWARD 2 #define MODE_FORWARD 3 #define MODE_DIRECT_NONE_MV 4 +#define MODE_DIRECT_NO4V 5 typedef struct @@ -59,6 +59,7 @@ VECTOR mv16; VECTOR pmvs[4]; + 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 @@ -69,11 +70,27 @@ // bframe stuff VECTOR b_mvs[4]; - VECTOR b_pmvs[4]; + VECTOR b_qmvs[4]; +// VECTOR b_pmvs[1]; + + // bframe direct mode + +// VECTOR directmv[4]; +// VECTOR deltamv; int mb_type; int dbquant; + // stuff for block based ME (needed for Qpel ME) + // backup of last integer ME vectors/sad + +// VECTOR i_mv16; + VECTOR i_mvs[4]; + + int32_t i_sad8[4]; // SAD values for inter4v-VECTORs +// int32_t i_sad16; // SAD value for inter-VECTOR + + } MACROBLOCK;