--- global.h 2003/12/08 13:20:59 1.21.2.11 +++ global.h 2010/09/13 07:38:09 1.26 @@ -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: global.h,v 1.21.2.11 2003/12/08 13:20:59 syskin Exp $ + * $Id: global.h,v 1.26 2010/09/13 07:38:09 Isibaar Exp $ * ****************************************************************************/ @@ -48,7 +48,6 @@ #define MODE_DIRECT_NONE_MV 4 #define MODE_DIRECT_NO4V 5 - /* * vop coding types * intra, prediction, backward, sprite, not_coded @@ -73,7 +72,6 @@ return xvid_type - 1; } - typedef struct { int x; @@ -81,8 +79,6 @@ } VECTOR; - - typedef struct { VECTOR duv[3]; @@ -168,7 +164,6 @@ } IMAGE; - typedef struct { uint32_t bufa; @@ -182,10 +177,8 @@ } Bitstream; - #define MBPRED_SIZE 15 - typedef struct { /* decoder/encoder */ @@ -213,6 +206,9 @@ int dquant; int cbp; + /* lambda for these blocks */ + int lambda[6]; + /* bframe stuff */ VECTOR b_mvs[4]; @@ -220,6 +216,8 @@ VECTOR amv; /* average motion vectors from GMC */ int32_t mcsel; + + VECTOR mvs_avg; //CK average of field motion vectors /* This structure has become way to big! What to do? Split it up? */