--- xvid.h 2003/04/27 14:21:35 1.27.2.16 +++ xvid.h 2003/07/24 13:09:27 1.27.2.28 @@ -3,23 +3,23 @@ * XVID MPEG-4 VIDEO CODEC * - XviD Main header file - * - * This file is part of XviD, a free MPEG-4 video encoder/decoder + * Copyright(C) 2001-2003 Peter Ross * - * This program is free software; you can redistribute it and/or modify + * 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 + * 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 * - * $Id: xvid.h,v 1.27.2.16 2003/04/27 14:21:35 chl Exp $ + * $Id: xvid.h,v 1.27.2.28 2003/07/24 13:09:27 Isibaar Exp $ * ****************************************************************************/ @@ -67,7 +67,7 @@ * doesnt hurt but not increasing it could cause difficulty for decoders in the * future */ -#define XVID_BS_VERSION "0009" +#define XVID_BS_VERSION "0014" /***************************************************************************** @@ -99,7 +99,7 @@ #define XVID_CSP_BGRA 6 /* 32-bit bgra packed */ #define XVID_CSP_ABGR 7 /* 32-bit abgr packed */ #define XVID_CSP_RGBA 8 /* 32-bit rgba packed */ -#define XVID_CSP_BGR 9 /* 32-bit bgr packed */ +#define XVID_CSP_BGR 9 /* 24-bit bgr packed */ #define XVID_CSP_RGB555 10 /* 16-bit rgb555 packed */ #define XVID_CSP_RGB565 11 /* 16-bit rgb565 packed */ #define XVID_CSP_SLICE 12 /* decoder only: 4:2:0 planar, per slice rendering */ @@ -116,6 +116,20 @@ int stride[4]; /* [in] image stride; "bytes per row"*/ } xvid_image_t; +/* video-object-sequence profiles */ +#define XVID_PROFILE_S_L0 0x08 /* simple */ +#define XVID_PROFILE_S_L1 0x01 +#define XVID_PROFILE_S_L2 0x02 +#define XVID_PROFILE_S_L3 0x03 +#define XVID_PROFILE_ARTS_L1 0x91 /* advanced realtime simple */ +#define XVID_PROFILE_ARTS_L2 0x92 +#define XVID_PROFILE_ARTS_L3 0x93 +#define XVID_PROFILE_ARTS_L4 0x94 +#define XVID_PROFILE_AS_L0 0xf0 /* advanced simple */ +#define XVID_PROFILE_AS_L1 0xf1 +#define XVID_PROFILE_AS_L2 0xf2 +#define XVID_PROFILE_AS_L3 0xf3 +#define XVID_PROFILE_AS_L4 0xf4 /* aspect ratios */ #define XVID_PAR_11_VGA 1 /* 1:1 vga (square) */ @@ -134,6 +148,7 @@ #define XVID_TYPE_BVOP 3 /* bidirectionally encoded */ #define XVID_TYPE_SVOP 4 /* predicted+sprite frame */ + /***************************************************************************** * xvid_global() ****************************************************************************/ @@ -154,11 +169,22 @@ #define XVID_CPU_ALTIVEC 0x00000001 /* altivec */ +#define XVID_DEBUG_ERROR 0x00000001 +#define XVID_DEBUG_STARTCODE 0x00000002 +#define XVID_DEBUG_HEADER 0x00000004 +#define XVID_DEBUG_TIMECODE 0x00000008 +#define XVID_DEBUG_MB 0x00000010 +#define XVID_DEBUG_COEFF 0x00000020 +#define XVID_DEBUG_MV 0x00000040 +#define XVID_DEBUG_RC 0x00000080 +#define XVID_DEBUG_DEBUG 0x80000000 + /* XVID_GBL_INIT param1 */ typedef struct { int version; int cpu_flags; /* [in:opt] zero = autodetect cpu XVID_CPU_FORCE|{cpu features} = force cpu features */ + int debug; /* [in:opt] debug level */ } xvid_gbl_init_t; @@ -255,6 +281,19 @@ } xvid_dec_stats_t; + +#define XVID_ZONE_QUANT 1 +#define XVID_ZONE_WEIGHT 2 +typedef struct +{ + int frame; + int mode; + int increment; + int base; +} xvid_enc_zone_t; + + + /***************************************************************************** xvid plugin system -- internals @@ -264,6 +303,7 @@ xvidcore will call XVID_PLG_DESTROY during XVID_ENC_DESTROY ****************************************************************************/ + #define XVID_PLG_CREATE 0 #define XVID_PLG_DESTROY 1 #define XVID_PLG_INFO 2 @@ -279,7 +319,7 @@ typedef struct { int version; - int flags; /* plugin flags */ + int flags; /* [in:opt] plugin flags */ } xvid_plg_info_t; @@ -287,14 +327,17 @@ { int version; - int width; - int height; - int mb_width; - int mb_height; - int fincr; - int fbase; + int num_zones; /* [out] */ + xvid_enc_zone_t * zones; /* [out] */ - void * param; + int width; /* [out] */ + int height; /* [out] */ + int mb_width; /* [out] */ + int mb_height; /* [out] */ + int fincr; /* [out] */ + int fbase; /* [out] */ + + void * param; /* [out] */ } xvid_plg_create_t; @@ -310,12 +353,17 @@ { int version; + xvid_enc_zone_t * zone; /* [out] current zone */ + int width; /* [out] */ int height; /* [out] */ int mb_width; /* [out] */ int mb_height; /* [out] */ int fincr; /* [out] */ int fbase; /* [out] */ + + int min_quant[3]; /* [out] */ + int max_quant[3]; /* [out] */ xvid_image_t reference; /* [out] -> [out] */ xvid_image_t current; /* [out] -> [in,out] */ @@ -367,11 +415,9 @@ } xvid_enc_plugin_t; - -xvid_plugin_func xvid_plugin_fixed; /* fixed quantizer control */ -xvid_plugin_func xvid_plugin_cbr; /* constant bitrate control */ -xvid_plugin_func xvid_plugin_2pass1; /* 2pass rate control: first pass */ -xvid_plugin_func xvid_plugin_2pass2; /* 2pass rate control: second pass */ +xvid_plugin_func xvid_plugin_single; /* single-pass rate control */ +xvid_plugin_func xvid_plugin_2pass1; /* two-pass rate control: first pass */ +xvid_plugin_func xvid_plugin_2pass2; /* two-pass rate control: second pass */ xvid_plugin_func xvid_plugin_lumimasking; /* lumimasking */ @@ -379,24 +425,15 @@ xvid_plugin_func xvid_plugin_dump; /* dump before and after yuvpgms */ -typedef struct -{ - int version; - int quant_increment; - int quant_base; -} xvid_plugin_fixed_t; - -typedef struct +typedef struct /* single pass rate control */ { int version; int bitrate; /* bits per second */ - int max_quantizer; - int min_quantizer; int reaction_delay_factor; int averaging_period; int buffer; -} xvid_plugin_cbr_t; +} xvid_plugin_single_t; typedef struct { @@ -405,18 +442,14 @@ } xvid_plugin_2pass1_t; -#define XVID_CURVE_COSINE 0 /* low aggressiveness */ -#define XVID_CURVE_LINEAR 1 /* medium aggressiveness */ -#define XVID_CURVE_SINE 2 /* high aggressiveness */ - #define XVID_PAYBACK_BIAS 0 /* payback with bias */ #define XVID_PAYBACK_PROP 1 /* payback proportionally */ typedef struct { int version; + int bitrate; /* bits per second */ char * filename; - int bitrate; /* bits per second */ - + int keyframe_boost; /* keyframe boost percentage: [0..100...]; */ int payback_method; int bitrate_payback_delay; @@ -424,22 +457,12 @@ int curve_compression_low; int max_overflow_improvement; int max_overflow_degradation; - int min_quant[3]; - int max_quant[3]; - - int use_alt_curve; - int alt_curve_high_dist; - int alt_curve_low_dist; - int alt_curve_use_auto; - int alt_curve_auto_str; - int alt_curve_type; /* XVID_CURVE_ */ - int alt_curve_min_rel_qual; - int alt_curve_use_auto_bonus_bias; - int alt_curve_bonus_bias; int kftreshold; int kfreduction; int min_key_interval; + + int container_frame_overhead; }xvid_plugin_2pass2_t; @@ -493,7 +516,6 @@ color input material chroma is ignored) */ XVID_VOP_HQACPRED = 0x00000080, /* 20030209: high quality ac prediction */ XVID_VOP_MODEDECISION_BITS = 0x00000100, /* enable DCT-ME and use it for mode decision */ - XVID_VOP_DYNAMIC_BFRAMES = 0x00000200, /* only valid for vol_flags|=XVID_VOL_INTERLACING */ XVID_VOP_TOPFIELDFIRST = 0x00000400, /* set top-field-first flag */ @@ -501,6 +523,9 @@ /* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */ XVID_VOP_REDUCED = 0x00001000, /* reduced resolution vop */ + + XVID_VOP_CARTOON = 0x00002000, /* use 'cartoon mode' */ + } xvid_vop_t; @@ -536,16 +561,24 @@ XVID_ME_UNRESTRICTED16 = 0x00200000, /* unrestricted ME, not implemented */ XVID_ME_OVERLAPPING16 = 0x00400000, /* overlapping ME, not implemented */ XVID_ME_UNRESTRICTED8 = 0x20000000, /* unrestricted ME, not implemented */ - XVID_ME_OVERLAPPING8 = 0x40000000 /* overlapping ME, not implemented */ + XVID_ME_OVERLAPPING8 = 0x40000000, /* overlapping ME, not implemented */ + + XVID_GME_REFINE = 0x00010000 + } xvid_motion_t; /* XVID_ENC_CREATE param1 */ typedef struct { int version; + + int profile; /* [in] profile@level; refer to XVID_PROFILE_xxx */ int width; /* [in] frame dimensions; width, pixel units */ int height; /* [in] frame dimensions; height, pixel units */ + int num_zones; /* [in:opt] number of bitrate zones */ + xvid_enc_zone_t * zones; /* ^^ zone array */ + int num_plugins; /* [in:opt] number of plugins */ xvid_enc_plugin_t * plugins; /* ^^ plugin array */ @@ -570,6 +603,9 @@ int bquant_ratio; /* [in:opt] bframe quantizer multipier/offeset; used to decide bframes quant when bquant==-1 */ int bquant_offset; /* bquant = (avg(past_ref_quant,future_ref_quant)*bquant_ratio + bquant_offset) / 100 */ + int min_quant[3]; /* [in:opt] */ + int max_quant[3]; /* [in:opt] */ + /* ^^^ -------------------------------------------------------------------------*/ void *handle; /* [out] encoder instance handle */