Use int64_t for buffer offset in inter-pred.
Backport VP9 change 5957832
Change-Id: Iefaf4edac7ccc1f57077810a2be711c7b2f2d1a3
diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index 4d62991..9d562f9 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -246,13 +246,14 @@
return clamped_mv;
}
-static INLINE int scaled_buffer_offset(int x_offset, int y_offset, int stride,
- const struct scale_factors *sf) {
+static INLINE int64_t scaled_buffer_offset(int x_offset, int y_offset,
+ int stride,
+ const struct scale_factors *sf) {
const int x =
sf ? sf->scale_value_x(x_offset, sf) >> SCALE_EXTRA_BITS : x_offset;
const int y =
sf ? sf->scale_value_y(y_offset, sf) >> SCALE_EXTRA_BITS : y_offset;
- return y * stride + x;
+ return (int64_t)y * stride + x;
}
static INLINE void setup_pred_plane(struct buf_2d *dst, BLOCK_SIZE bsize,
