ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvs/xvidcore/src/decoder.h
(Generate patch)

Comparing xvidcore/src/decoder.h (file contents):
Revision 1.12 by edgomez, Tue Nov 26 23:44:09 2002 UTC vs.
Revision 1.13 by edgomez, Sat Feb 15 15:22:17 2003 UTC

# Line 3 | Line 3
3   *  XVID MPEG-4 VIDEO CODEC
4   *  - Decoder header -
5   *
6 < *  This file is part of XviD, a free MPEG-4 video encoder/decoder
7 < *
8 < *  XviD is free software; you can redistribute it and/or modify it
9 < *  under the terms of the GNU General Public License as published by
10 < *  the Free Software Foundation; either version 2 of the License, or
6 > *  This program is an implementation of a part of one or more MPEG-4
7 > *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
8 > *  to use this software module in hardware or software products are
9 > *  advised that its use may infringe existing patents or copyrights, and
10 > *  any such use would be at such party's own risk.  The original
11 > *  developer of this software module and his/her company, and subsequent
12 > *  editors and their companies, will have no liability for use of this
13 > *  software or modifications or derivatives thereof.
14 > *
15 > *  This program is free software ; you can redistribute it and/or modify
16 > *  it under the terms of the GNU General Public License as published by
17 > *  the Free Software Foundation ; either version 2 of the License, or
18   *  (at your option) any later version.
19   *
20   *  This program is distributed in the hope that it will be useful,
21 < *  but WITHOUT ANY WARRANTY; without even the implied warranty of
21 > *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
22   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
23   *  GNU General Public License for more details.
24   *
25   *  You should have received a copy of the GNU General Public License
26 < *  along with this program; if not, write to the Free Software
26 > *  along with this program ; if not, write to the Free Software
27   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
28   *
29 < *  Under section 8 of the GNU General Public License, the copyright
30 < *  holders of XVID explicitly forbid distribution in the following
31 < *  countries:
32 < *
26 < *    - Japan
27 < *    - United States of America
28 < *
29 < *  Linking XviD statically or dynamically with other modules is making a
30 < *  combined work based on XviD.  Thus, the terms and conditions of the
31 < *  GNU General Public License cover the whole combination.
32 < *
33 < *  As a special exception, the copyright holders of XviD give you
34 < *  permission to link XviD with independent modules that communicate with
35 < *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
36 < *  license terms of these independent modules, and to copy and distribute
37 < *  the resulting combined work under terms of your choice, provided that
38 < *  every copy of the combined work is accompanied by a complete copy of
39 < *  the source code of XviD (the version of XviD used to produce the
40 < *  combined work), being distributed under the terms of the GNU General
41 < *  Public License plus this exception.  An independent module is a module
42 < *  which is not derived from or based on XviD.
43 < *
44 < *  Note that people who make modified versions of XviD are not obligated
45 < *  to grant this special exception for their modified versions; it is
46 < *  their choice whether to do so.  The GNU General Public License gives
47 < *  permission to release a modified version without this exception; this
48 < *  exception also makes it possible to release a modified version which
49 < *  carries forward this exception.
29 > ****************************************************************************/
30 > /*****************************************************************************
31 > *
32 > *  History
33   *
34 < * $Id$
34 > *  - 13.06.2002 Added legal header - Cosmetic
35 > *
36 > *  $Id$
37   *
38   ****************************************************************************/
39  
# Line 64 | Line 49
49   * Structures
50   ****************************************************************************/
51  
52 + /* complexity estimation toggles */
53   typedef struct
54   {
55 <        /* bitstream */
55 >        int method;
56  
57 <        uint32_t shape;
57 >        int opaque;
58 >        int transparent;
59 >        int intra_cae;
60 >        int inter_cae;
61 >        int no_update;
62 >        int upsampling;
63 >
64 >        int intra_blocks;
65 >        int inter_blocks;
66 >        int inter4v_blocks;
67 >        int gmc_blocks;
68 >        int not_coded_blocks;
69 >
70 >        int dct_coefs;
71 >        int dct_lines;
72 >        int vlc_symbols;
73 >        int vlc_bits;
74 >
75 >        int apm;
76 >        int npm;
77 >        int interpolate_mc_q;
78 >        int forw_back_mc_q;
79 >        int halfpel2;
80 >        int halfpel4;
81 >
82 >        int sadct;
83 >        int quarterpel;
84 > } ESTIMATION;
85 >
86 >
87 > typedef struct
88 > {
89 >        // vol bitstream
90 >
91 >        int time_inc_resolution;
92 >        int fixed_time_inc;
93          uint32_t time_inc_bits;
94 +
95 +        uint32_t shape;
96          uint32_t quant_bits;
97          uint32_t quant_type;
98 <        uint32_t quarterpel;
98 >        int32_t quarterpel;
99 >        int complexity_estimation_disable;
100 >        ESTIMATION estimation;
101  
102 <        uint32_t interlacing;
102 >        int interlacing;
103          uint32_t top_field_first;
104          uint32_t alternate_vertical_scan;
105  
106 <        /* image */
106 >        int aspect_ratio;
107 >        int par_width;
108 >        int par_height;
109 >
110 >        int sprite_enable;
111 >        int sprite_warping_points;
112 >        int sprite_warping_accuracy;
113 >        int sprite_brightness_change;
114 >
115 >        int newpred_enable;
116 >        int reduced_resolution_enable;
117 >
118 >        // image
119  
120 +        int fixed_dimensions;
121          uint32_t width;
122          uint32_t height;
123          uint32_t edged_width;
124          uint32_t edged_height;
125  
126          IMAGE cur;
127 <        IMAGE refn[3];                          /* 0   -- last I or P VOP */
128 <        /* 1   -- first I or P */
129 <        /* 2   -- for interpolate mode B-frame */
130 <        IMAGE refh;
93 <        IMAGE refv;
94 <        IMAGE refhv;
127 >        IMAGE refn[2];                          // 0   -- last I or P VOP
128 >                                                                // 1   -- first I or P
129 >        IMAGE tmp;              /* bframe interpolation, and post processing tmp buffer */
130 >        IMAGE qtmp;             /* quarter pel tmp buffer */
131  
132 <        /* macroblock */
132 >        // macroblock
133  
134          uint32_t mb_width;
135          uint32_t mb_height;
136          MACROBLOCK *mbs;
137  
138 <        /* for B-frame */
139 <        int32_t frames;                         /* total frame number */
138 >        // for B-frame & low_delay==0
139 >        // XXX: should move frame based stuff into a DECODER_FRAMEINFO struct */
140 >        MACROBLOCK *last_mbs;                   // last MB
141 >        int last_reduced_resolution;    // last reduced_resolution value
142 >        int32_t frames;                         // total frame number
143 >        int32_t packed_mode;            // bframes packed bitstream? (1 = yes)
144          int8_t scalability;
145 <        VECTOR p_fmv, p_bmv;            /* pred forward & backward motion vector */
146 <        MACROBLOCK *last_mbs;           /* last MB */
107 <        int64_t time;                           /* for record time */
145 >        VECTOR p_fmv, p_bmv;            // pred forward & backward motion vector
146 >        int64_t time;                           // for record time
147          int64_t time_base;
148          int64_t last_time_base;
149          int64_t last_non_b_time;
150          uint32_t time_pp;
151          uint32_t time_bp;
152 <        uint8_t low_delay;                      /* low_delay flage (1 means no B_VOP) */
152 >        uint32_t low_delay;                     // low_delay flage (1 means no B_VOP)
153 >        uint32_t low_delay_default;     // default value for low_delay flag
154  
155 <        XVID_DEC_PICTURE* out_frm;                /* This is used for slice rendering */
155 >        // for GMC: central place for all parameters
156 >        
157 >        IMAGE gmc;              /* gmc tmp buffer, remove for blockbased compensation */
158 >        GMC_DATA gmc_data;
159 >        
160 >        XVID_DEC_PICTURE* out_frm;                // This is used for slice rendering
161   }
162   DECODER;
163  
# Line 125 | Line 170 | void init_decoder(uint32_t cpu_flags);
170   int decoder_create(XVID_DEC_PARAM * param);
171   int decoder_destroy(DECODER * dec);
172   int decoder_decode(DECODER * dec,
173 <                                   XVID_DEC_FRAME * frame);
173 >                                   XVID_DEC_FRAME * frame, XVID_DEC_STATS * stats);
174  
175  
176   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines