--- trunk/xvidcore/src/xvid.h 2002/06/23 03:58:32 234 +++ trunk/xvidcore/src/xvid.h 2002/09/04 22:26:04 412 @@ -1,43 +1,40 @@ /***************************************************************************** -* -* XVID MPEG-4 VIDEO CODEC -* - XviD Main header file - -* -* 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 -* 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 -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -* -*****************************************************************************/ -/***************************************************************************** -* -* History -* -* - 2002/06/13 Added legal header, ANSI C comment style (only for this header -* as it can be included in a ANSI C project). -* -* ToDo ? : when BFRAMES is defined, the API_VERSION should not -* be the same (3.0 ?) -* -* $Id: xvid.h,v 1.13 2002-06-23 03:58:32 suxen_drol Exp $ -* -*****************************************************************************/ - + * + * XVID MPEG-4 VIDEO CODEC + * - XviD Main header file - + * + * This program is an implementation of a part of one or more MPEG-4 + * Video tools as specified in ISO/IEC 14496-2 standard. Those intending + * to use this software module in hardware or software products are + * advised that its use may infringe existing patents or copyrights, and + * any such use would be at such party's own risk. The original + * developer of this software module and his/her company, and subsequent + * editors and their companies, will have no liability for use of this + * software or modifications or derivatives thereof. + * + * 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 + * 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 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id: xvid.h,v 1.19 2002-09-04 22:26:04 edgomez Exp $ + * + *****************************************************************************/ #ifndef _XVID_H_ #define _XVID_H_ #ifdef __cplusplus -* $Id: xvid.h,v 1.13 2002-06-23 03:58:32 suxen_drol Exp $ +extern "C" { #endif /***************************************************************************** @@ -49,47 +46,49 @@ /* Error codes */ -#define XVID_ERR_FAIL -1 -#define XVID_ERR_OK 0 -#define XVID_ERR_MEMORY 1 -#define XVID_ERR_FORMAT 2 +#define XVID_ERR_FAIL -1 +#define XVID_ERR_OK 0 +#define XVID_ERR_MEMORY 1 +#define XVID_ERR_FORMAT 2 /* Colorspaces */ -#define XVID_CSP_RGB24 0 -#define XVID_CSP_YV12 1 -#define XVID_CSP_YUY2 2 -#define XVID_CSP_UYVY 3 -#define XVID_CSP_I420 4 -#define XVID_CSP_RGB555 10 -#define XVID_CSP_RGB565 11 -#define XVID_CSP_USER 12 -#define XVID_CSP_EXTERN 1004 // per slice rendering -#define XVID_CSP_YVYU 1002 -#define XVID_CSP_RGB32 1000 -#define XVID_CSP_NULL 9999 +#define XVID_CSP_RGB24 0 +#define XVID_CSP_YV12 1 +#define XVID_CSP_YUY2 2 +#define XVID_CSP_UYVY 3 +#define XVID_CSP_I420 4 +#define XVID_CSP_RGB555 10 +#define XVID_CSP_RGB565 11 +#define XVID_CSP_USER 12 +#define XVID_CSP_EXTERN 1004 // per slice rendering +#define XVID_CSP_YVYU 1002 +#define XVID_CSP_RGB32 1000 +#define XVID_CSP_NULL 9999 -#define XVID_CSP_VFLIP 0x80000000 // flip mask +#define XVID_CSP_VFLIP 0x80000000 // flip mask /***************************************************************************** + * Initialization constants ****************************************************************************/ /* CPU flags for XVID_INIT_PARAM.cpu_flags */ -#define XVID_CPU_MMX 0x00000001 -#define XVID_CPU_MMXEXT 0x00000002 -#define XVID_CPU_SSE 0x00000004 -#define XVID_CPU_SSE2 0x00000008 -#define XVID_CPU_3DNOW 0x00000010 -#define XVID_CPU_3DNOWEXT 0x00000020 - -#define XVID_CPU_TSC 0x00000040 + /* x86 cpu flags */ +#define XVID_CPU_MMX 0x00000001 +#define XVID_CPU_MMXEXT 0x00000002 +#define XVID_CPU_SSE 0x00000004 +#define XVID_CPU_SSE2 0x00000008 +#define XVID_CPU_3DNOW 0x00000010 +#define XVID_CPU_3DNOWEXT 0x00000020 +#define XVID_CPU_TSC 0x00000040 -#define XVID_CPU_IA64 0x00000080 + /* ia64 cpu flags */ +#define XVID_CPU_IA64 0x00000080 -#define XVID_CPU_CHKONLY 0x40000000 /* check cpu only; dont init globals */ -#define XVID_CPU_FORCE 0x80000000 +#define XVID_CPU_CHKONLY 0x40000000 /* check cpu only; dont init globals */ +#define XVID_CPU_FORCE 0x80000000 /***************************************************************************** @@ -154,6 +153,14 @@ int stride_y, stride_u,stride_v; } XVID_DEC_PICTURE; + +/***************************************************************************** + * Decoder entry point + ****************************************************************************/ + +/* decoder options */ +#define XVID_DEC_DECODE 0 +#define XVID_DEC_CREATE 1 #define XVID_DEC_DESTROY 2 int xvid_decore(void *handle, @@ -166,10 +173,12 @@ * Encoder constants ****************************************************************************/ -/* Flags for XVID_ENC_PARAM.global */ -#define XVID_GLOBAL_PACKED 0x00000001 /* packed bitstream */ -#define XVID_GLOBAL_DX50BVOP 0x00000002 /* dx50 bvop compatibility */ -#define XVID_GLOBAL_DEBUG 0x00000004 /* print debug info on each frame */ +/* Flags for XVID_ENC_PARAM.global + * ToDo : Remove this part when BFRAMES stuff will be out of XviD stable tree + */ +#define XVID_GLOBAL_PACKED 0x00000001 /* packed bitstream */ +#define XVID_GLOBAL_DX50BVOP 0x00000002 /* dx50 bvop compatibility */ +#define XVID_GLOBAL_DEBUG 0x00000004 /* print debug info on each frame */ /* Flags for XVID_ENC_FRAME.general */ #define XVID_VALID_FLAGS 0x80000000 @@ -198,13 +207,17 @@ #define XVID_ME_EPZS 0x00100000 -#define XVID_GREYSCALE 0x01000000 /* enable greyscale only mode (even for */ -#define XVID_GRAYSCALE 0x01000000 /* color input material chroma is ignored) */ +#define XVID_GREYSCALE 0x01000000 /* enable greyscale only mode (even for */ +#define XVID_GRAYSCALE XVID_GREYSCALE /* color input material chroma is ignored) */ /* Flags for XVID_ENC_FRAME.motion */ #define PMV_ADVANCEDDIAMOND8 0x00004000 #define PMV_ADVANCEDDIAMOND16 0x00008000 + +#define PMV_HALFPELDIAMOND16 0x00010000 +#define PMV_HALFPELREFINE16 0x00020000 +#define PMV_EXTSEARCH16 0x00040000 /* extend PMV by more searches */ #define PMV_EARLYSTOP16 0x00080000 #define PMV_QUICKSTOP16 0x00100000 /* like early, but without any more refinement */ #define PMV_UNRESTRICTED16 0x00200000 /* unrestricted ME, not implemented */ @@ -227,32 +240,28 @@ typedef struct { - int width, height; - int fincr, fbase; /* frame increment, fbase. each frame = "fincr/fbase" seconds */ - int rc_bitrate; /* the bitrate of the target encoded stream, in bits/second */ - int rc_reaction_delay_factor; /* how fast the rate control reacts - lower values are faster */ - int rc_averaging_period; /* as above */ - int rc_buffer; /* as above */ - int max_quantizer; /* the upper limit of the quantizer */ - int min_quantizer; /* the lower limit of the quantizer */ - int max_key_interval; /* the maximum interval between key frames */ + int width; + int height; + int fincr; + int fbase; /* frame increment, fbase. each frame = "fincr/fbase" seconds */ + int rc_bitrate; /* the bitrate of the target encoded stream, in bits/second */ + int rc_reaction_delay_factor; /* how fast the rate control reacts - lower values are faster */ + int rc_averaging_period; /* as above */ + int rc_buffer; /* as above */ + int max_quantizer; /* the upper limit of the quantizer */ + int min_quantizer; /* the lower limit of the quantizer */ + int max_key_interval; /* the maximum interval between key frames */ #ifdef _SMP - int num_threads; /* number of threads */ + int num_threads; /* number of threads */ #endif -#ifdef BFRAMES - int global; /* global/debug options */ - int max_bframes; /* max sequential bframes (0=disable bframes) */ - int bquant_ratio; /* bframe quantizer multipier (percentage). - * used only when bquant < 1 - * eg. 200 = x2 multiplier -#endif - void *handle; /* [out] encoder instance handle */ + void *handle; /* [out] encoder instance handle */ } XVID_ENC_PARAM; typedef struct { int x; + int y; } VECTOR; @@ -299,10 +308,6 @@ */ HINTINFO hint; /* [in/out] mv hint information */ -#ifdef BFRAMES - int bquant; /* [in] bframe quantizer */ -#endif - } XVID_ENC_FRAME;