diff options
| author | Linfeng Zhang <linfengz@google.com> | 2018-04-03 15:36:41 -0700 |
|---|---|---|
| committer | Linfeng Zhang <linfengz@google.com> | 2018-04-03 15:36:41 -0700 |
| commit | 47f22fc5fb1a1cad1ed9b4026f866f866fa348c0 (patch) | |
| tree | 5b057ad87bc3a07a2fdef9295b1494bd3d80b9de /vp9/encoder | |
| parent | ee37046f1b07a4df47a6943b4750b1ad6115db0e (diff) | |
| download | libvpx-47f22fc5fb1a1cad1ed9b4026f866f866fa348c0.tar libvpx-47f22fc5fb1a1cad1ed9b4026f866f866fa348c0.tar.gz libvpx-47f22fc5fb1a1cad1ed9b4026f866f866fa348c0.tar.bz2 libvpx-47f22fc5fb1a1cad1ed9b4026f866f866fa348c0.zip | |
rm CONVERT_TO_SHORTPTR in vpx_highbd_comp_avg_pred
BUG=webm:1388
Change-Id: I1d0dd9af52a1461e3e2b2d60e8c4b6b74c3b90b0
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_mcomp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index 37406c232..1cb978667 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -329,8 +329,8 @@ static unsigned int setup_center_error( if (second_pred != NULL) { if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { DECLARE_ALIGNED(16, uint16_t, comp_pred16[64 * 64]); - vpx_highbd_comp_avg_pred(comp_pred16, second_pred, w, h, y + offset, - y_stride); + vpx_highbd_comp_avg_pred(comp_pred16, CONVERT_TO_SHORTPTR(second_pred), w, + h, CONVERT_TO_SHORTPTR(y + offset), y_stride); besterr = vfp->vf(CONVERT_TO_BYTEPTR(comp_pred16), w, src, src_stride, sse1); } else { |