generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86/convolve.h: remove redundant check in FUN_CONV_2D

Browse Source 
the filter will be the same in this case

Change-Id: I95159bcb05bbfb71b57da741393e80cc7ffc5cff
This commit is contained in:
James Zern 2016-02-25 23:31:50 -08:00
parent 6d8c8c6201
commit 654d2163c9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vpx_dsp/x86/convolve.h
View File

@ -102,8 +102,7 @@ void vpx_convolve8_##avg##opt(const uint8_t *src, ptrdiff_t src_stride, \
assert(h <= 64); \ assert(h <= 64); \
assert(x_step_q4 == 16); \ assert(x_step_q4 == 16); \
assert(y_step_q4 == 16); \ assert(y_step_q4 == 16); \
if (filter_x[0] | filter_x[1] | filter_x[2] | \ if (filter_x[0] | filter_x[1] | filter_x[2]) { \
filter_y[0] | filter_y[1] | filter_y[2]) { \
DECLARE_ALIGNED(16, uint8_t, fdata2[64 * 71]); \ DECLARE_ALIGNED(16, uint8_t, fdata2[64 * 71]); \
vpx_convolve8_horiz_##opt(src - 3 * src_stride, src_stride, fdata2, 64, \ vpx_convolve8_horiz_##opt(src - 3 * src_stride, src_stride, fdata2, 64, \
filter_x, x_step_q4, filter_y, y_step_q4, \ 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(w <= 64); \
assert(h <= 64); \ assert(h <= 64); \
if (x_step_q4 == 16 && y_step_q4 == 16) { \ if (x_step_q4 == 16 && y_step_q4 == 16) { \
if ((filter_x[0] | filter_x[1] | filter_x[2]) || filter_x[3] == 128 || \ 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) { \
DECLARE_ALIGNED(16, uint16_t, fdata2[64 * 71]); \ DECLARE_ALIGNED(16, uint16_t, fdata2[64 * 71]); \
vpx_highbd_convolve8_horiz_##opt(src - 3 * src_stride, src_stride, \ vpx_highbd_convolve8_horiz_##opt(src - 3 * src_stride, src_stride, \
CONVERT_TO_BYTEPTR(fdata2), 64, \ CONVERT_TO_BYTEPTR(fdata2), 64, \