diff options
| author | Linfeng Zhang <linfengz@google.com> | 2017-04-19 13:08:25 -0700 |
|---|---|---|
| committer | Linfeng Zhang <linfengz@google.com> | 2017-04-25 14:22:19 -0700 |
| commit | 51dc998f3a2d04b9aa293cff000be34c5eaa5b9d (patch) | |
| tree | 85a7a2d3bb5607a332626b5763fbaa65ff0f93df /vp9/encoder/vp9_rdopt.c | |
| parent | 92ec0674fdb21f3f195a1aba227e53adc1033621 (diff) | |
| download | libvpx-51dc998f3a2d04b9aa293cff000be34c5eaa5b9d.tar libvpx-51dc998f3a2d04b9aa293cff000be34c5eaa5b9d.tar.gz libvpx-51dc998f3a2d04b9aa293cff000be34c5eaa5b9d.tar.bz2 libvpx-51dc998f3a2d04b9aa293cff000be34c5eaa5b9d.zip | |
Update highbd convolve functions arguments to use uint16_t src/dst
BUG=webm:1388
Change-Id: I6912de2639895d817ce850da8ea9f6c8fe21da42
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 5 |
1 files changed, 2 insertions, 3 deletions
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); |