diff cavs.h @ 8796:c6dd98bff427 libavcodec

introduce a macroblock index to avoid a few x*width+y calculations
author stefang
date Tue, 10 Feb 2009 22:38:02 +0000
parents 7798afcf0b24
children 9a793cb05a85
line wrap: on
line diff
--- a/cavs.h	Tue Feb 10 20:51:35 2009 +0000
+++ b/cavs.h	Tue Feb 10 22:38:02 2009 +0000
@@ -166,7 +166,7 @@
     int loop_filter_disable;
     int alpha_offset, beta_offset;
     int ref_flag;
-    int mbx, mby;      ///< macroblock coordinates
+    int mbx, mby, mbidx; ///< macroblock coordinates
     int flags;         ///< availability flags of neighbouring macroblocks
     int stc;           ///< last start code
     uint8_t *cy, *cu, *cv; ///< current MB sample pointers
@@ -212,7 +212,6 @@
     void (*intra_pred_l[8])(uint8_t *d,uint8_t *top,uint8_t *left,int stride);
     void (*intra_pred_c[7])(uint8_t *d,uint8_t *top,uint8_t *left,int stride);
     uint8_t *col_type_base;
-    uint8_t *col_type;
 
     /* scaling factors for MV prediction */
     int sym_factor;    ///< for scaling in symmetrical B block
@@ -272,7 +271,7 @@
     h->mv[MV_BWD_X0] = ff_cavs_intra_mv;
     set_mvs(&h->mv[MV_BWD_X0], BLK_16X16);
     if(h->pic_type != FF_B_TYPE)
-        *h->col_type = I_8X8;
+        h->col_type_base[h->mbidx] = I_8X8;
 }
 
 static inline int dequant(AVSContext *h, DCTELEM *level_buf, uint8_t *run_buf,