--- encoder.h 2003/02/22 08:49:44 1.27.2.1 +++ encoder.h 2003/03/26 11:01:03 1.27.2.6 @@ -36,7 +36,7 @@ * support for EXTENDED API * - 22.08.2001 fixed bug in iDQtab * - * $Id: encoder.h,v 1.27.2.1 2003/02/22 08:49:44 suxen_drol Exp $ + * $Id: encoder.h,v 1.27.2.6 2003/03/26 11:01:03 suxen_drol Exp $ * ****************************************************************************/ @@ -52,13 +52,6 @@ * Constants ****************************************************************************/ -/* Quatization type */ -#define H263_QUANT 0 -#define MPEG4_QUANT 1 - -/* Indicates no quantizer changes in INTRA_Q/INTER_Q modes */ -#define NO_CHANGE 64 - /***************************************************************************** * Types ****************************************************************************/ @@ -80,6 +73,8 @@ uint32_t mb_width; uint32_t mb_height; + int plugin_flags; + /* frame rate increment & base */ uint32_t fincr; uint32_t fbase; @@ -138,6 +133,8 @@ typedef struct { + int frame_num; + int fincr; xvid_vol_t vol_flags; xvid_vop_t vop_flags; xvid_motion_t motion_flags; @@ -173,12 +170,21 @@ int iFrameNum; int bitrate; + // plugins + unsigned int num_plugins; /* note: we store plugin flags in MBPARAM */ + xvid_enc_plugin_t * plugins; + + // dquant + + int * temp_dquants; + // images FRAMEINFO *current; FRAMEINFO *reference; - IMAGE sOriginal; + IMAGE sOriginal; /* original image copy for i/p frames */ + IMAGE sOriginal2; /* original image copy for b-frames */ IMAGE vInterH; IMAGE vInterV; IMAGE vInterVf; @@ -254,7 +260,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,