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_encoder.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_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index d82b706be..b1b4ba0e0 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -2418,11 +2418,11 @@ static void scale_and_extend_frame(const YV12_BUFFER_CONFIG *src, uint8_t *dst_ptr = dsts[i] + (y / factor) * dst_stride + (x / factor); if (src->flags & YV12_FLAG_HIGHBITDEPTH) { - vpx_highbd_convolve8( - CAST_TO_BYTEPTR(CONVERT_TO_SHORTPTR(src_ptr)), src_stride, - CAST_TO_BYTEPTR(CONVERT_TO_SHORTPTR(dst_ptr)), dst_stride, - kernel[x_q4 & 0xf], 16 * src_w / dst_w, kernel[y_q4 & 0xf], - 16 * src_h / dst_h, 16 / factor, 16 / factor, bd); + vpx_highbd_convolve8(CONVERT_TO_SHORTPTR(src_ptr), src_stride, + CONVERT_TO_SHORTPTR(dst_ptr), dst_stride, + kernel[x_q4 & 0xf], 16 * src_w / dst_w, + kernel[y_q4 & 0xf], 16 * src_h / dst_h, + 16 / factor, 16 / factor, bd); } else { vpx_scaled_2d(src_ptr, src_stride, dst_ptr, dst_stride, kernel[x_q4 & 0xf], 16 * src_w / dst_w, |