Revert "Allow a large motion search range"
This reverts commit 6471e8bd7ed006bf3a84253e4057414638efd988.
Change-Id: I4278faf5816d56cf6a6c82c34dfa408e713a63e5
diff --git a/av1/encoder/mcomp.h b/av1/encoder/mcomp.h
index c3d0cf3..42eca55 100644
--- a/av1/encoder/mcomp.h
+++ b/av1/encoder/mcomp.h
@@ -21,9 +21,9 @@
// The maximum number of steps in a step search given the largest
// allowed initial step
-#define MAX_MVSEARCH_STEPS 12
+#define MAX_MVSEARCH_STEPS 11
// Max full pel mv specified in the unit of full pixel
-// Enable the use of motion vector in range [-2047, 2047].
+// Enable the use of motion vector in range [-1023, 1023].
#define MAX_FULL_PEL_VAL ((1 << (MAX_MVSEARCH_STEPS - 1)) - 1)
// Maximum size of the first step in full pel units
#define MAX_FIRST_STEP (1 << (MAX_MVSEARCH_STEPS - 1))
@@ -74,6 +74,13 @@
const aom_variance_fn_ptr_t *fn_ptr,
const struct mv *center_mv);
+// Runs sequence of diamond searches in smaller steps for RD.
+int av1_full_pixel_diamond(const struct AV1_COMP *cpi, MACROBLOCK *x,
+ MV *mvp_full, int step_param, int sadpb,
+ int further_steps, int do_refine, int *cost_list,
+ const aom_variance_fn_ptr_t *fn_ptr,
+ const MV *ref_mv, MV *dst_mv);
+
// Perform integral projection based motion estimation.
unsigned int av1_int_pro_motion_estimation(const struct AV1_COMP *cpi,
MACROBLOCK *x, BLOCK_SIZE bsize,
