--- decoder.h 2002/12/08 05:38:56 1.10.2.3 +++ decoder.h 2002/11/16 23:38:16 1.11 @@ -3,37 +3,52 @@ * XVID MPEG-4 VIDEO CODEC * - Decoder header - * - * 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 + * 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 * (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 * - ****************************************************************************/ -/***************************************************************************** - * - * History + * 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. * - * - 13.06.2002 Added legal header - Cosmetic - * - * $Id: decoder.h,v 1.10.2.3 2002/12/08 05:38:56 suxen_drol Exp $ + * $Id: decoder.h,v 1.11 2002/11/16 23:38:16 edgomez Exp $ * ****************************************************************************/ @@ -49,74 +64,22 @@ * Structures ****************************************************************************/ -/* complexity estimation toggles */ typedef struct { - int method; - - int opaque; - int transparent; - int intra_cae; - int inter_cae; - int no_update; - int upsampling; - - int intra_blocks; - int inter_blocks; - int inter4v_blocks; - int not_coded_blocks; - - int dct_coefs; - int dct_lines; - int vlc_symbols; - int vlc_bits; - - int apm; - int npm; - int interpolate_mc_q; - int forw_back_mc_q; - int halfpel2; - int halfpel4; - - int sadct; - int quarterpel; -} ESTIMATION; - - -typedef struct -{ - // vol bitstream - - int time_inc_resolution; - int fixed_time_inc; - uint32_t time_inc_bits; + // bitstream uint32_t shape; + uint32_t time_inc_bits; uint32_t quant_bits; uint32_t quant_type; uint32_t quarterpel; - int complexity_estimation_disable; - ESTIMATION estimation; - int interlacing; + uint32_t interlacing; uint32_t top_field_first; uint32_t alternate_vertical_scan; - int aspect_ratio; - int par_width; - int par_height; - - int sprite_enable; - int sprite_warping_points; - int sprite_warping_accuracy; - int sprite_brightness_change; - - int newpred_enable; - int reduced_resolution_enable; - // image - int fixed_dimensions; uint32_t width; uint32_t height; uint32_t edged_width; @@ -138,7 +101,6 @@ // for B-frame int32_t frames; // total frame number - int32_t packed_mode; // bframes packed bitstream? (1 = yes) int8_t scalability; VECTOR p_fmv, p_bmv; // pred forward & backward motion vector MACROBLOCK *last_mbs; // last MB @@ -163,7 +125,7 @@ int decoder_create(XVID_DEC_PARAM * param); int decoder_destroy(DECODER * dec); int decoder_decode(DECODER * dec, - XVID_DEC_FRAME * frame, XVID_DEC_STATS * stats); + XVID_DEC_FRAME * frame); #endif