[cvs] / xvidcore / src / encoder.h Repository:
ViewVC logotype

Diff of /xvidcore/src/encoder.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.29, Fri Dec 9 04:45:35 2005 UTC revision 1.33, Mon Sep 13 07:38:09 2010 UTC
# Line 79  Line 79 
79          int par_width;          int par_width;
80          int par_height;          int par_height;
81    
 #ifdef _SMP  
         int num_threads;  
 #endif  
   
   
82          int iMaxKeyInterval;          int iMaxKeyInterval;
83          int max_bframes;          int max_bframes;
84    
# Line 101  Line 96 
96          int64_t m_stamp;          int64_t m_stamp;
97    
98          uint16_t *mpeg_quant_matrices;          uint16_t *mpeg_quant_matrices;
99            uint32_t last_quant_initialized_intra; /* needed for mpeg matrices initialization */
100  } MBParam;  } MBParam;
101    
   
102  typedef struct  typedef struct
103  {  {
104          int iTextBits;          int iTextBits;
# Line 113  Line 108 
108          int mblks;          int mblks;
109          int ublks;          int ublks;
110          int gblks;          int gblks;
111            int iMVBits;
112  } Statistics;  } Statistics;
113    
   
114  /* encoding queue */  /* encoding queue */
115  typedef struct  typedef struct
116  {  {
# Line 125  Line 120 
120          IMAGE image;          IMAGE image;
121  } QUEUEINFO;  } QUEUEINFO;
122    
   
123  typedef struct  typedef struct
124  {  {
125      int frame_num;      int frame_num;
# Line 158  Line 152 
152          int is_edged, is_interpolated;          int is_edged, is_interpolated;
153  } FRAMEINFO;  } FRAMEINFO;
154    
155    #include "motion/motion_smp.h"
156    
157  typedef struct  typedef struct
158  {  {
# Line 217  Line 212 
212          int closed_bframenum; /* == -1 if there is no fixup intended */          int closed_bframenum; /* == -1 if there is no fixup intended */
213      QUEUEINFO closed_qframe;    /* qFrame, only valid when >= 0 */      QUEUEINFO closed_qframe;    /* qFrame, only valid when >= 0 */
214    
215            /* multithreaded stuff */
216            int num_threads;                        /* number of additional threads */
217            SMPmotionData * motionData;     /* data structures used to pass all thread-specific data */
218    
219          int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */          int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
220    
221          float fMvPrevSigma;          float fMvPrevSigma;
# Line 254  Line 253 
253                  return 0;                  return 0;
254  }  }
255    
   
256  /*****************************************************************************  /*****************************************************************************
257   * Prototypes   * Prototypes
258   ****************************************************************************/   ****************************************************************************/

Legend:
Removed from v.1.29  
changed lines
  Added in v.1.33

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4