--- xvid.h 2003/05/17 13:26:28 1.27.2.19 +++ xvid.h 2003/07/28 12:29:01 1.27.2.29 @@ -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.19 2003/05/17 13:26:28 suxen_drol Exp $ + * $Id: xvid.h,v 1.27.2.29 2003/07/28 12:29:01 edgomez 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 "0016" /***************************************************************************** @@ -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 */ @@ -442,10 +442,6 @@ } 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 */ @@ -462,19 +458,11 @@ int max_overflow_improvement; int max_overflow_degradation; - 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; @@ -535,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; @@ -570,7 +561,10 @@ 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;