diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2015-08-11 21:46:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-11 21:46:50 +0000 |
| commit | b04dad328c33874ae1eda72c73079519935a3feb (patch) | |
| tree | 0e2c776cc981464199b155b6dc28cbd49c1bf36a /vp9 | |
| parent | 762641baccd4db63a6cb99404872b690a5dc0722 (diff) | |
| parent | 4e6b5079c65ccf396c0c4a606dd7e13ccb7da54f (diff) | |
| download | libvpx-b04dad328c33874ae1eda72c73079519935a3feb.tar libvpx-b04dad328c33874ae1eda72c73079519935a3feb.tar.gz libvpx-b04dad328c33874ae1eda72c73079519935a3feb.tar.bz2 libvpx-b04dad328c33874ae1eda72c73079519935a3feb.zip | |
Merge "VPX: remove scaled calls from FUN_CONV_1D"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 73face763..0680550cf 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -2587,13 +2587,13 @@ static void scale_and_extend_frame(const YV12_BUFFER_CONFIG *src, kernel[y_q4 & 0xf], 16 * src_h / dst_h, 16 / factor, 16 / factor, bd); } else { - vpx_convolve8(src_ptr, src_stride, dst_ptr, dst_stride, + vpx_scaled_2d(src_ptr, src_stride, 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); } #else - vpx_convolve8(src_ptr, src_stride, dst_ptr, dst_stride, + vpx_scaled_2d(src_ptr, src_stride, 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); |