Change return value in av1_warp_error
Modified return value of 'av1_warp_error' to INT64_MAX
when warp params are invalid.
STATS_CHANGED
Change-Id: I0f83dcce57adfb2fcf1140949c2ae471a9b9bdbd
diff --git a/av1/common/warped_motion.h b/av1/common/warped_motion.h
index 3b9c4a6..4b43f61 100644
--- a/av1/common/warped_motion.h
+++ b/av1/common/warped_motion.h
@@ -147,15 +147,6 @@
return error_measure_lut[255 + err];
}
-// Returns the error between the result of applying motion 'wm' to the frame
-// described by 'ref' and the frame described by 'dst'.
-int64_t av1_warp_error(WarpedMotionParams *wm, int use_hbd, int bd,
- const uint8_t *ref, int width, int height, int stride,
- uint8_t *dst, int p_col, int p_row, int p_width,
- int p_height, int p_stride, int subsampling_x,
- int subsampling_y, int64_t best_error,
- uint8_t *segment_map, int segment_map_stride);
-
// Returns the error between the frame described by 'ref' and the frame
// described by 'dst'.
int64_t av1_frame_error(int use_hbd, int bd, const uint8_t *ref, int stride,
@@ -166,6 +157,21 @@
int p_height, int p_stride,
uint8_t *segment_map, int segment_map_stride);
+int64_t av1_calc_highbd_frame_error(const uint16_t *const ref, int stride,
+ const uint16_t *const dst, int p_width,
+ int p_height, int p_stride, int bd);
+
+void highbd_warp_plane(WarpedMotionParams *wm, const uint16_t *const ref,
+ int width, int height, int stride, uint16_t *const pred,
+ int p_col, int p_row, int p_width, int p_height,
+ int p_stride, int subsampling_x, int subsampling_y,
+ int bd, ConvolveParams *conv_params);
+
+void warp_plane(WarpedMotionParams *wm, const uint8_t *const ref, int width,
+ int height, int stride, uint8_t *pred, int p_col, int p_row,
+ int p_width, int p_height, int p_stride, int subsampling_x,
+ int subsampling_y, ConvolveParams *conv_params);
+
void av1_warp_plane(WarpedMotionParams *wm, int use_hbd, int bd,
const uint8_t *ref, int width, int height, int stride,
uint8_t *pred, int p_col, int p_row, int p_width,
