From 51dc998f3a2d04b9aa293cff000be34c5eaa5b9d Mon Sep 17 00:00:00 2001 From: Linfeng Zhang Date: Wed, 19 Apr 2017 13:08:25 -0700 Subject: Update highbd convolve functions arguments to use uint16_t src/dst BUG=webm:1388 Change-Id: I6912de2639895d817ce850da8ea9f6c8fe21da42 --- vp9/encoder/vp9_rdopt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'vp9/encoder/vp9_rdopt.c') diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 2278ddc0f..5e566e1da 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -599,9 +599,8 @@ static void dist_block(const VP9_COMP *cpi, MACROBLOCK *x, int plane, #if CONFIG_VP9_HIGHBITDEPTH if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { - vpx_highbd_convolve_copy(CAST_TO_BYTEPTR(CONVERT_TO_SHORTPTR(dst)), - dst_stride, recon, 32, NULL, 0, NULL, 0, bs, - bs, xd->bd); + vpx_highbd_convolve_copy(CONVERT_TO_SHORTPTR(dst), dst_stride, recon16, + 32, NULL, 0, NULL, 0, bs, bs, xd->bd); recon = CONVERT_TO_BYTEPTR(recon16); if (xd->lossless) { vp9_highbd_iwht4x4_add(dqcoeff, recon, 32, *eob, xd->bd); -- cgit v1.2.3