force unroll macroblock_load_pic_pointers

[x264] / common / predict.h

diff --git a/common/predict.h b/common/predict.h
index 3a9554d7a5a6965dbc3c2dbbf2373fc75fc9c24a..b9221680fc107d05aa701c07e654a0869bb83b1c 100644 (file)
--- a/common/predict.h
+++ b/common/predict.h
@@ -21,11 +21,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _PREDICT_H
-#define _PREDICT_H 1
+#ifndef X264_PREDICT_H
+#define X264_PREDICT_H
 
-typedef void (*x264_predict_t)( uint8_t *src, int i_stride );
-typedef void (*x264_predict8x8_t)( uint8_t *src, int i_stride, int i_neighbor );
+typedef void (*x264_predict_t)( uint8_t *src );
+typedef void (*x264_predict8x8_t)( uint8_t *src, uint8_t edge[33] );
 
 enum intra_chroma_pred_e
 {
@@ -38,7 +38,7 @@ enum intra_chroma_pred_e
     I_PRED_CHROMA_DC_TOP  = 5,
     I_PRED_CHROMA_DC_128  = 6
 };
-static const int x264_mb_pred_mode8x8c_fix[7] =
+static const uint8_t x264_mb_pred_mode8x8c_fix[7] =
 {
     I_PRED_CHROMA_DC, I_PRED_CHROMA_H, I_PRED_CHROMA_V, I_PRED_CHROMA_P,
     I_PRED_CHROMA_DC, I_PRED_CHROMA_DC,I_PRED_CHROMA_DC
@@ -55,7 +55,7 @@ enum intra16x16_pred_e
     I_PRED_16x16_DC_TOP  = 5,
     I_PRED_16x16_DC_128  = 6,
 };
-static const int x264_mb_pred_mode16x16_fix[7] =
+static const uint8_t x264_mb_pred_mode16x16_fix[7] =
 {
     I_PRED_16x16_V, I_PRED_16x16_H, I_PRED_16x16_DC, I_PRED_16x16_P,
     I_PRED_16x16_DC,I_PRED_16x16_DC,I_PRED_16x16_DC
@@ -77,7 +77,7 @@ enum intra4x4_pred_e
     I_PRED_4x4_DC_TOP  = 10,
     I_PRED_4x4_DC_128  = 11,
 };
-static const int x264_mb_pred_mode4x4_fix[13] =
+static const int8_t x264_mb_pred_mode4x4_fix[13] =
 {
     -1,
     I_PRED_4x4_V,   I_PRED_4x4_H,   I_PRED_4x4_DC,
@@ -105,6 +105,9 @@ enum intra8x8_pred_e
     I_PRED_8x8_DC_128  = 11,
 };
 
+// FIXME enforce edge alignment via uint64_t ?
+void x264_predict_8x8_filter( uint8_t *src, uint8_t edge[33], int i_neighbor, int i_filters );
+
 void x264_predict_16x16_init ( int cpu, x264_predict_t pf[7] );
 void x264_predict_8x8c_init  ( int cpu, x264_predict_t pf[7] );
 void x264_predict_4x4_init   ( int cpu, x264_predict_t pf[12] );