--- encoder.h	2002/11/26 23:44:10	1.25
+++ encoder.h	2010/09/13 07:38:09	1.33
@@ -1,56 +1,26 @@
 /*****************************************************************************
  *
  *  XVID MPEG-4 VIDEO CODEC
- *  - Encoder header -
+ *  - Encoder related header  -
  *
- *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
+ *  Copyright(C) 2002-2003 Michael Militzer <isibaar@xvid.org>
+ *               2002-2003 Peter Ross <pross@xvid.org>
  *
- *  This file is part of XviD, a free MPEG-4 video encoder/decoder
- *
- *  XviD is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  This program is free software ; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation ; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- *  Under section 8 of the GNU General Public License, the copyright
- *  holders of XVID explicitly forbid distribution in the following
- *  countries:
- *
- *    - Japan
- *    - United States of America
- *
- *  Linking XviD statically or dynamically with other modules is making a
- *  combined work based on XviD.  Thus, the terms and conditions of the
- *  GNU General Public License cover the whole combination.
- *
- *  As a special exception, the copyright holders of XviD give you
- *  permission to link XviD with independent modules that communicate with
- *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
- *  license terms of these independent modules, and to copy and distribute
- *  the resulting combined work under terms of your choice, provided that
- *  every copy of the combined work is accompanied by a complete copy of
- *  the source code of XviD (the version of XviD used to produce the
- *  combined work), being distributed under the terms of the GNU General
- *  Public License plus this exception.  An independent module is a module
- *  which is not derived from or based on XviD.
- *
- *  Note that people who make modified versions of XviD are not obligated
- *  to grant this special exception for their modified versions; it is
- *  their choice whether to do so.  The GNU General Public License gives
- *  permission to release a modified version without this exception; this
- *  exception also makes it possible to release a modified version which
- *  carries forward this exception.
- *
- * $Id: encoder.h,v 1.25 2002/11/26 23:44:10 edgomez Exp $
+ * $Id: encoder.h,v 1.33 2010/09/13 07:38:09 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -60,19 +30,13 @@
 #include "xvid.h"
 #include "portab.h"
 #include "global.h"
-#include "image/image.h"
-#include "utils/ratecontrol.h"
 
 /*****************************************************************************
  * 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
+/* lambda base exponential. 1<<LAMBDA_EXP is the neutral lambda */
+#define LAMBDA_EXP		6
 
 /*****************************************************************************
  * Types
@@ -80,20 +44,13 @@
 
 typedef int bool;
 
-typedef enum
-{
-	I_VOP = 0,
-	P_VOP = 1,
-	B_VOP = 2
-}
-VOP_TYPE;
-
 /*****************************************************************************
  * Structures
  ****************************************************************************/
 
 typedef struct
 {
+    /* --- constants --- */
 	uint32_t width;
 	uint32_t height;
 
@@ -102,92 +59,167 @@
 	uint32_t mb_width;
 	uint32_t mb_height;
 
+    int plugin_flags;
+
 	/* frame rate increment & base */
-	uint32_t fincr;
+	int32_t fincr;
 	uint32_t fbase;
 
-#ifdef _SMP
-	int num_threads;
-#endif
+    int profile;
+
+	int global_flags;
+	int bquant_ratio;
+	int bquant_offset;
+	int frame_drop_ratio;
+
+    int min_quant[3];
+    int max_quant[3];
+
+	int par;
+	int par_width;
+	int par_height;
+
+	int iMaxKeyInterval;
+	int max_bframes;
 
+/* --- inbetween vop stuff --- */
 	/* rounding type; alternate 0-1 after each interframe */
 	/* 1 <= fixed_code <= 4
 	   automatically adjusted using motion vector statistics inside
 	 */
 
 	/* vars that not "quite" frame independant */
-	uint32_t m_quant_type;
 	uint32_t m_rounding_type;
 	uint32_t m_fcode;
+    int vol_flags;
 
-	HINTINFO *hint;
+	int64_t m_stamp;
 
-	uint32_t m_seconds;
-	uint32_t m_ticks;
+	uint16_t *mpeg_quant_matrices;
+	uint32_t last_quant_initialized_intra; /* needed for mpeg matrices initialization */
+} MBParam;
 
-}
-MBParam;
+typedef struct
+{
+	int iTextBits;
+	int iMvSum;
+	int iMvCount;
+	int kblks;
+	int mblks;
+	int ublks;
+	int gblks;
+	int iMVBits;
+} Statistics;
 
+/* encoding queue */
+typedef struct
+{
+	xvid_enc_frame_t frame;
+	unsigned char quant_intra_matrix[64];
+	unsigned char quant_inter_matrix[64];
+	IMAGE image;
+} QUEUEINFO;
 
 typedef struct
 {
-	uint32_t quant;
-	uint32_t motion_flags;
-	uint32_t global_flags;
+    int frame_num;
+    int fincr;
+	int vol_flags;
+    int vop_flags;
+	int motion_flags;
 
-	VOP_TYPE coding_type;
+	int coding_type;
+	uint32_t quant;
 	uint32_t rounding_type;
 	uint32_t fcode;
 	uint32_t bcode;
 
 	uint32_t seconds;
 	uint32_t ticks;
+	int64_t stamp;
 
 	IMAGE image;
 
 	MACROBLOCK *mbs;
 
-}
-FRAMEINFO;
+	WARPPOINTS warp;		/* as in bitstream */
+	GMC_DATA gmc_data;		/* common data for all MBs */
+	NEW_GMC_DATA new_gmc_data;		/* common data for all MBs */
 
-typedef struct
-{
-	int iTextBits;
-	float fMvPrevSigma;
-	int iMvSum;
-	int iMvCount;
-	int kblks;
-	int mblks;
-	int ublks;
-}
-Statistics;
+    int length;         /* the encoded size of this frame */
 
+	Statistics sStat;
+	int is_edged, is_interpolated;
+} FRAMEINFO;
 
+#include "motion/motion_smp.h"
 
 typedef struct
 {
 	MBParam mbParam;
 
 	int iFrameNum;
-	int iMaxKeyInterval;
 	int bitrate;
 
+    /* zones */
+    unsigned int num_zones;
+    xvid_enc_zone_t * zones;
+
+    /* plugins */
+    int num_plugins;    /* note: we store plugin flags in MBPARAM */
+    xvid_enc_plugin_t * plugins;
+
+    /* dquant */
+
+    int * temp_dquants;
+
+    /* lambda */
+
+    float * temp_lambda;
+
 	/* images */
 
 	FRAMEINFO *current;
 	FRAMEINFO *reference;
 
-#ifdef _DEBUG_PSNR
-	IMAGE sOriginal;
-#endif
+	IMAGE sOriginal;    /* original image copy for i/p frames */
+    IMAGE sOriginal2;   /* original image copy for b-frames */
 	IMAGE vInterH;
 	IMAGE vInterV;
+	IMAGE vInterVf;
 	IMAGE vInterHV;
+	IMAGE vInterHVf;
 
-	Statistics sStat;
-	RateControl rate_control;
-}
-Encoder;
+	IMAGE vGMC;
+
+	/* image queue */
+	int queue_head;
+	int queue_tail;
+	int queue_size;
+	QUEUEINFO *queue;
+
+	/* bframe buffer */
+	int bframenum_head;
+	int bframenum_tail;
+	int flush_bframes;
+
+	FRAMEINFO **bframes;
+	IMAGE f_refh;
+	IMAGE f_refv;
+	IMAGE f_refhv;
+
+    /* closed_gop fixup temporary storage */
+	int closed_bframenum; /* == -1 if there is no fixup intended */
+    QUEUEINFO closed_qframe;	/* qFrame, only valid when >= 0 */
+
+	/* multithreaded stuff */
+	int num_threads;			/* number of additional threads */
+	SMPmotionData * motionData;	/* data structures used to pass all thread-specific data */
+
+	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
+
+	float fMvPrevSigma;
+} Encoder;
 
 /*****************************************************************************
  * Inline functions
@@ -221,21 +253,16 @@
 		return 0;
 }
 
-
 /*****************************************************************************
  * Prototypes
  ****************************************************************************/
 
 void init_encoder(uint32_t cpu_flags);
 
-int encoder_create(XVID_ENC_PARAM * pParam);
-int encoder_destroy(Encoder * pEnc);
-int encoder_encode(Encoder * pEnc,
-				   XVID_ENC_FRAME * pFrame,
-				   XVID_ENC_STATS * pResult);
-
-int encoder_encode_bframes(Encoder * pEnc,
-				   XVID_ENC_FRAME * pFrame,
-				   XVID_ENC_STATS * pResult);
+int enc_create(xvid_enc_create_t * create);
+int enc_destroy(Encoder * pEnc);
+int enc_encode(Encoder * pEnc,
+				   xvid_enc_frame_t * pFrame,
+				   xvid_enc_stats_t * stats);
 
 #endif