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

Diff of /xvidcore/src/global.h

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

revision 1.21.2.8, Sun Jul 13 09:58:26 2003 UTC revision 1.21.2.11, Mon Dec 8 13:20:59 2003 UTC
# Line 132  Line 132 
132          int dxF, dyF, dxG, dyG;          int dxF, dyF, dxG, dyG;
133          int Fo, Go;          int Fo, Go;
134          int cFo, cGo;          int cFo, cGo;
135  }  } GMC_DATA;
 GMC_DATA;  
136    
137  typedef struct NEW_GMC_DATA NEW_GMC_DATA;  typedef struct _NEW_GMC_DATA
 struct NEW_GMC_DATA  
138  {  {
139    int num_wp;   //  0=none, 1=translation, 2,3 = warping     /*  0=none, 1=translation, 2,3 = warping
140                  //  a value of -1 means: "structure not initialized!"          *  a value of -1 means: "structure not initialized!" */
141    int accuracy;     // {0,1,2,3}  =>   {1/2,1/4,1/8,1/16} pel          int num_wp;
142    
143            /* {0,1,2,3}  =>   {1/2,1/4,1/8,1/16} pel */
144            int accuracy;
145    
146    int sW, sH;   // sprite size * 16          /* sprite size * 16 */
147    int dU[2], dV[2], Uo, Vo, Uco, Vco;   // gradient, calculated from warp points          int sW, sH;
148    
149    void (*predict_16x16)(const NEW_GMC_DATA * const This,          /* gradient, calculated from warp points */
150            int dU[2], dV[2], Uo, Vo, Uco, Vco;
151    
152            void (*predict_16x16)(const struct _NEW_GMC_DATA * const This,
153                          uint8_t *dst, const uint8_t *src,                          uint8_t *dst, const uint8_t *src,
154                          int dststride, int srcstride, int x, int y, int rounding);                          int dststride, int srcstride, int x, int y, int rounding);
155    void (*predict_8x8)  (const NEW_GMC_DATA * const This,          void (*predict_8x8)  (const struct _NEW_GMC_DATA * const This,
156                          uint8_t *uDst, const uint8_t *uSrc,                          uint8_t *uDst, const uint8_t *uSrc,
157                          uint8_t *vDst, const uint8_t *vSrc,                          uint8_t *vDst, const uint8_t *vSrc,
158                          int dststride, int srcstride, int x, int y, int rounding);                          int dststride, int srcstride, int x, int y, int rounding);
159    void (*get_average_mv)(const NEW_GMC_DATA * const Dsp, VECTOR * const mv,          void (*get_average_mv)(const struct _NEW_GMC_DATA * const Dsp, VECTOR * const mv,
160                           int x, int y, int qpel);                           int x, int y, int qpel);
161  };  } NEW_GMC_DATA;
162    
163  typedef struct  typedef struct
164  {  {
# Line 200  Line 204 
204    
205          /* encoder specific */          /* encoder specific */
206    
         VECTOR mv16;  
207          VECTOR pmvs[4];          VECTOR pmvs[4];
208          VECTOR qmvs[4];                         /* mvs in quarter pixel resolution */          VECTOR qmvs[4];                         /* mvs in quarter pixel resolution */
209    
# Line 215  Line 218 
218          VECTOR b_mvs[4];          VECTOR b_mvs[4];
219          VECTOR b_qmvs[4];          VECTOR b_qmvs[4];
220    
         int mb_type;  
   
         /*  
          * stuff for block based ME (needed for Qpel ME)  
          * backup of last integer ME vectors/sad  
          */  
   
221          VECTOR amv; /* average motion vectors from GMC  */          VECTOR amv; /* average motion vectors from GMC  */
222          int32_t mcsel;          int32_t mcsel;
223    

Legend:
Removed from v.1.21.2.8  
changed lines
  Added in v.1.21.2.11

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