--- branches/dev-api-3/xvidcore/src/encoder.h 2002/11/29 10:46:15 689 +++ branches/dev-api-3/xvidcore/src/encoder.h 2002/12/04 12:31:18 690 @@ -36,7 +36,7 @@ * support for EXTENDED API * - 22.08.2001 fixed bug in iDQtab * - * $Id: encoder.h,v 1.18.2.5 2002-11-19 13:21:25 suxen_drol Exp $ + * $Id: encoder.h,v 1.18.2.6 2002-12-04 12:31:18 suxen_drol Exp $ * ****************************************************************************/ @@ -119,6 +119,18 @@ typedef struct { + int iTextBits; + int iMvSum; + int iMvCount; + int kblks; + int mblks; + int ublks; +} +Statistics; + + +typedef struct +{ uint32_t quant; uint32_t motion_flags; uint32_t global_flags; @@ -137,20 +149,10 @@ MACROBLOCK *mbs; VECTOR GMC_MV; -} -FRAMEINFO; -typedef struct -{ - int iTextBits; - float fMvPrevSigma; - int iMvSum; - int iMvCount; - int kblks; - int mblks; - int ublks; + Statistics sStat; } -Statistics; +FRAMEINFO; @@ -201,8 +203,9 @@ int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */ - Statistics sStat; RateControl rate_control; + + float fMvPrevSigma; } Encoder;