--- branches/dev-api-4/xvidcore/src/encoder.h 2003/03/16 12:05:09 926 +++ branches/dev-api-4/xvidcore/src/encoder.h 2003/05/18 12:33:26 1035 @@ -36,7 +36,7 @@ * support for EXTENDED API * - 22.08.2001 fixed bug in iDQtab * - * $Id: encoder.h,v 1.27.2.5 2003-03-16 12:04:14 suxen_drol Exp $ + * $Id: encoder.h,v 1.27.2.8 2003-05-18 12:33:26 edgomez Exp $ * ****************************************************************************/ @@ -46,7 +46,6 @@ #include "xvid.h" #include "portab.h" #include "global.h" -#include "utils/ratecontrol.h" /***************************************************************************** * Constants @@ -79,11 +78,16 @@ uint32_t fincr; uint32_t fbase; + int profile; + xvid_global_t global_flags; int bquant_ratio; int bquant_offset; int frame_drop_ratio; + int min_quant[3]; + int max_quant[3]; + #ifdef _SMP int num_threads; #endif @@ -170,6 +174,10 @@ int iFrameNum; int bitrate; + // zones + unsigned int num_zones; + xvid_enc_zone_t * zones; + // plugins unsigned int num_plugins; /* note: we store plugin flags in MBPARAM */ xvid_enc_plugin_t * plugins; @@ -215,8 +223,6 @@ int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */ - RateControl rate_control; - float fMvPrevSigma; } Encoder; @@ -260,7 +266,7 @@ void init_encoder(uint32_t cpu_flags); -int enc_create(xvid_enc_create_t * create, xvid_enc_rc_t * rc); +int enc_create(xvid_enc_create_t * create); int enc_destroy(Encoder * pEnc); int enc_encode(Encoder * pEnc, xvid_enc_frame_t * pFrame,