--- global.h 2002/10/05 21:34:56 1.13.2.2 +++ global.h 2002/12/10 11:13:50 1.13.2.5 @@ -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 --- */ @@ -23,6 +22,14 @@ #define MODE_DIRECT_NONE_MV 4 #define MODE_DIRECT_NO4V 5 +typedef struct +{ + uint8_t *y; + uint8_t *u; + uint8_t *v; +} +IMAGE; + typedef struct { @@ -71,6 +78,7 @@ // bframe stuff VECTOR b_mvs[4]; + VECTOR b_qmvs[4]; // VECTOR b_pmvs[1]; // bframe direct mode @@ -83,12 +91,13 @@ // stuff for block based ME (needed for Qpel ME) // backup of last integer ME vectors/sad - - VECTOR i_mv16; + +// 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 +// int32_t i_sad16; // SAD value for inter-VECTOR + } MACROBLOCK;