Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)."

libvpx/source/libvpx/vp8/encoder/mcomp.h

Index: libvpx/source/libvpx/vp8/encoder/mcomp.h
diff --git a/libvpx/source/libvpx/vp8/encoder/mcomp.h b/libvpx/source/libvpx/vp8/encoder/mcomp.h
index 416c4d5eb6a19b78c5424730d508728e75b40308..83f95c6e012665eeb9dd684d3d757986f896136b 100644
--- a/libvpx/source/libvpx/vp8/encoder/mcomp.h
+++ b/libvpx/source/libvpx/vp8/encoder/mcomp.h
@@ -22,11 +22,11 @@ extern void accum_mv_refs(MB_PREDICTION_MODE, const int near_mv_ref_cts[4]);
 
 
 #define MAX_MVSEARCH_STEPS 8                                    // The maximum number of steps in a step search given the largest allowed initial step
-#define MAX_FULL_PEL_VAL ((1 << (MAX_MVSEARCH_STEPS)) - 1)      // Max full pel mv specified in 1 pel units
+#define MAX_FULL_PEL_VAL ((1 << (MAX_MVSEARCH_STEPS+3)) - 8)    // Max full pel mv specified in 1/8 pel units
 #define MAX_FIRST_STEP (1 << (MAX_MVSEARCH_STEPS-1))            // Maximum size of the first step in full pel units
 
 extern void print_mode_context(void);
-extern int vp8_mv_bit_cost(int_mv *mv, int_mv *ref, int *mvcost[2], int Weight);
+extern int vp8_mv_bit_cost(MV *mv, MV *ref, int *mvcost[2], int Weight);
 extern void vp8_init_dsmotion_compensation(MACROBLOCK *x, int stride);
 extern void vp8_init3smotion_compensation(MACROBLOCK *x,  int stride);
 
@@ -36,20 +36,20 @@ extern int vp8_hex_search
     MACROBLOCK *x,
     BLOCK *b,
     BLOCKD *d,
-    int_mv *ref_mv,
-    int_mv *best_mv,
+    MV *ref_mv,
+    MV *best_mv,
     int search_param,
     int error_per_bit,
+    int *num00,
     const vp8_variance_fn_ptr_t *vf,
     int *mvsadcost[2],
     int *mvcost[2],
-    int_mv *center_mv
+    MV *center_mv
 );
 
 typedef int (fractional_mv_step_fp)
-    (MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *bestmv, int_mv *ref_mv,
-     int error_per_bit, const vp8_variance_fn_ptr_t *vfp, int *mvcost[2],
-     int *distortion, unsigned int *sse);
+    (MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *bestmv, MV *ref_mv,
+     int error_per_bit, const vp8_variance_fn_ptr_t *vfp, int *mvcost[2]);
 extern fractional_mv_step_fp vp8_find_best_sub_pixel_step_iteratively;
 extern fractional_mv_step_fp vp8_find_best_sub_pixel_step;
 extern fractional_mv_step_fp vp8_find_best_half_pixel_step;
@@ -61,26 +61,13 @@ extern fractional_mv_step_fp vp8_skip_fractional_mv_step;
      MACROBLOCK *x, \
      BLOCK *b, \
      BLOCKD *d, \
-     int_mv *ref_mv, \
-     int sad_per_bit, \
+     MV *ref_mv, \
+     int error_per_bit, \
      int distance, \
      vp8_variance_fn_ptr_t *fn_ptr, \
      int *mvcost[2], \
-     int_mv *center_mv \
-    )
-
-#define prototype_refining_search_sad(sym)\
-    int (sym)\
-    (\
-     MACROBLOCK *x, \
-     BLOCK *b, \
-     BLOCKD *d, \
-     int_mv *ref_mv, \
-     int sad_per_bit, \
-     int distance, \
-     vp8_variance_fn_ptr_t *fn_ptr, \
-     int *mvcost[2], \
-     int_mv *center_mv \
+     int *mvsadcost[2], \
+     MV *center_mv \
     )
 
 #define prototype_diamond_search_sad(sym)\
@@ -89,14 +76,15 @@ extern fractional_mv_step_fp vp8_skip_fractional_mv_step;
      MACROBLOCK *x, \
      BLOCK *b, \
      BLOCKD *d, \
-     int_mv *ref_mv, \
-     int_mv *best_mv, \
+     MV *ref_mv, \
+     MV *best_mv, \
      int search_param, \
-     int sad_per_bit, \
+     int error_per_bit, \
      int *num00, \
      vp8_variance_fn_ptr_t *fn_ptr, \
+     int *mvsadcost[2], \
      int *mvcost[2], \
-     int_mv *center_mv \
+     MV *center_mv \
     )
 
 #if ARCH_X86 || ARCH_X86_64
@@ -108,10 +96,6 @@ extern prototype_full_search_sad(vp8_full_search_sad);
 extern prototype_full_search_sad(vp8_full_search_sadx3);
 extern prototype_full_search_sad(vp8_full_search_sadx8);
 
-typedef prototype_refining_search_sad(*vp8_refining_search_fn_t);
-extern prototype_refining_search_sad(vp8_refining_search_sad);
-extern prototype_refining_search_sad(vp8_refining_search_sadx4);
-
 typedef prototype_diamond_search_sad(*vp8_diamond_search_fn_t);
 extern prototype_diamond_search_sad(vp8_diamond_search_sad);
 extern prototype_diamond_search_sad(vp8_diamond_search_sadx4);
@@ -121,11 +105,6 @@ extern prototype_diamond_search_sad(vp8_diamond_search_sadx4);
 #endif
 extern prototype_full_search_sad(vp8_search_full_search);
 
-#ifndef vp8_search_refining_search
-#define vp8_search_refining_search vp8_refining_search_sad
-#endif
-extern prototype_refining_search_sad(vp8_search_refining_search);
-
 #ifndef vp8_search_diamond_search
 #define vp8_search_diamond_search vp8_diamond_search_sad
 #endif
@@ -134,7 +113,6 @@ extern prototype_diamond_search_sad(vp8_search_diamond_search);
 typedef struct
 {
     prototype_full_search_sad(*full_search);
-    prototype_refining_search_sad(*refining_search);
     prototype_diamond_search_sad(*diamond_search);
 } vp8_search_rtcd_vtable_t;