diff options
| author | James Zern <jzern@google.com> | 2016-02-25 23:31:50 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-02-25 23:31:50 -0800 |
| commit | 654d2163c9c654f90267708c2d1d146f762a9e48 (patch) | |
| tree | ad9a757a98838151a014ffcda072e34156b6c0ee /vpx_dsp/x86 | |
| parent | 6d8c8c62019c00a14c899c7fed75bbe276bb103a (diff) | |
| download | libvpx-654d2163c9c654f90267708c2d1d146f762a9e48.tar libvpx-654d2163c9c654f90267708c2d1d146f762a9e48.tar.gz libvpx-654d2163c9c654f90267708c2d1d146f762a9e48.tar.bz2 libvpx-654d2163c9c654f90267708c2d1d146f762a9e48.zip | |
x86/convolve.h: remove redundant check in FUN_CONV_2D
the filter will be the same in this case
Change-Id: I95159bcb05bbfb71b57da741393e80cc7ffc5cff
Diffstat (limited to 'vpx_dsp/x86')
| -rw-r--r-- | vpx_dsp/x86/convolve.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vpx_dsp/x86/convolve.h b/vpx_dsp/x86/convolve.h index a26385e2d..7e43eb7c7 100644 --- a/vpx_dsp/x86/convolve.h +++ b/vpx_dsp/x86/convolve.h @@ -102,8 +102,7 @@ void vpx_convolve8_##avg##opt(const uint8_t *src, ptrdiff_t src_stride, \ assert(h <= 64); \ assert(x_step_q4 == 16); \ assert(y_step_q4 == 16); \ - if (filter_x[0] | filter_x[1] | filter_x[2] | \ - filter_y[0] | filter_y[1] | filter_y[2]) { \ + if (filter_x[0] | filter_x[1] | filter_x[2]) { \ DECLARE_ALIGNED(16, uint8_t, fdata2[64 * 71]); \ vpx_convolve8_horiz_##opt(src - 3 * src_stride, src_stride, fdata2, 64, \ filter_x, x_step_q4, filter_y, y_step_q4, \ @@ -239,8 +238,7 @@ void vpx_highbd_convolve8_##avg##opt(const uint8_t *src, ptrdiff_t src_stride, \ assert(w <= 64); \ assert(h <= 64); \ if (x_step_q4 == 16 && y_step_q4 == 16) { \ - if ((filter_x[0] | filter_x[1] | filter_x[2]) || filter_x[3] == 128 || \ - (filter_y[0] | filter_y[1] | filter_y[2]) || filter_y[3] == 128) { \ + if ((filter_x[0] | filter_x[1] | filter_x[2]) || filter_x[3] == 128) { \ DECLARE_ALIGNED(16, uint16_t, fdata2[64 * 71]); \ vpx_highbd_convolve8_horiz_##opt(src - 3 * src_stride, src_stride, \ CONVERT_TO_BYTEPTR(fdata2), 64, \ |