--- encoder.h 2002/11/19 13:21:25 1.18.2.5 +++ encoder.h 2002/12/09 10:47:05 1.18.2.7 @@ -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.7 2002/12/09 10:47:05 suxen_drol Exp $ * ****************************************************************************/ @@ -93,10 +93,17 @@ uint32_t fincr; uint32_t fbase; + /* constants */ + int global; + int bquant_ratio; + int bquant_offset; + int frame_drop_ratio; + #ifdef _SMP int num_threads; #endif - + + int iMaxKeyInterval; int max_bframes; /* rounding type; alternate 0-1 after each interframe */ @@ -109,6 +116,7 @@ uint32_t m_rounding_type; uint32_t m_fcode; uint32_t m_quarterpel; + int m_reduced_resolution; /* reduced_resolution_enable */ HINTINFO *hint; @@ -119,6 +127,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 +157,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; @@ -159,7 +169,6 @@ MBParam mbParam; int iFrameNum; - int iMaxKeyInterval; int bitrate; // images @@ -176,12 +185,6 @@ IMAGE vInterHV; IMAGE vInterHVf; - /* constants */ - int global; - int bquant_ratio; - int bquant_offset; - int frame_drop_ratio; - /* image queue */ int queue_head; int queue_tail; @@ -201,8 +204,9 @@ int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */ - Statistics sStat; RateControl rate_control; + + float fMvPrevSigma; } Encoder;