--- decoder.h 2004/03/03 13:18:08 1.13.2.10 +++ decoder.h 2010/12/18 10:13:30 1.20 @@ -3,7 +3,7 @@ * XVID MPEG-4 VIDEO CODEC * - Decoder related header - * - * Copyright(C) 2002-2003 Peter Ross + * Copyright(C) 2002-2010 Peter Ross * * 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 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: decoder.h,v 1.13.2.10 2004/03/03 13:18:08 syskin Exp $ + * $Id: decoder.h,v 1.20 2010/12/18 10:13:30 Isibaar Exp $ * ****************************************************************************/ @@ -80,6 +80,7 @@ uint32_t time_inc_bits; uint32_t shape; + int ver_id; uint32_t quant_bits; uint32_t quant_type; uint16_t *mpeg_quant_matrices; @@ -104,7 +105,7 @@ int newpred_enable; int reduced_resolution_enable; - /* The bitstream version if it's a XviD stream */ + /* The bitstream version if it's a Xvid stream */ int bs_version; /* image */ @@ -145,8 +146,8 @@ int64_t time_base; int64_t last_time_base; int64_t last_non_b_time; - uint32_t time_pp; - uint32_t time_bp; + int32_t time_pp; + int32_t time_bp; uint32_t low_delay; /* low_delay flage (1 means no B_VOP) */ uint32_t low_delay_default; /* default value for low_delay flag */ @@ -159,6 +160,11 @@ xvid_image_t* out_frm; /* This is used for slice rendering */ int * qscale; /* quantization table for decoder's stats */ + + /* Tells if the reference image is edged or not */ + int is_edged[2]; + + int num_threads; } DECODER;