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

x86/convolve.h: change filter[] || chains to |

Browse Source 
Change-Id: I661f64390f232826857b259e7a67e77f5a3a91ad
This commit is contained in:
James Zern 2016-02-24 19:35:37 -08:00
parent 784eebb2d3
commit b3ceb629ba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vpx_dsp/x86/convolve.h
View File

@ -33,7 +33,7 @@ typedef void filter8_1dfunction (
int w, int h) { \
assert(filter[3] != 128); \
assert(step_q4 == 16); \
if (filter[0] || filter[1] || filter[2]) { \
if (filter[0] | filter[1] | filter[2]) { \
while (w >= 16) { \
vpx_filter_block1d16_##dir##8_##avg##opt(src_start, \
src_stride, \
@ -116,8 +116,8 @@ 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] | \
filter_y[0] | filter_y[1] | filter_y[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, \
@ -161,7 +161,7 @@ typedef void highbd_filter8_1dfunction (
if (step_q4 == 16 && filter[3] != 128) { \
uint16_t *src = CONVERT_TO_SHORTPTR(src8); \
uint16_t *dst = CONVERT_TO_SHORTPTR(dst8); \
if (filter[0] || filter[1] || filter[2]) { \
if (filter[0] | filter[1] | filter[2]) { \
while (w >= 16) { \
vpx_highbd_filter_block1d16_##dir##8_##avg##opt(src_start, \
src_stride, \
@ -253,8 +253,8 @@ 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 || \
(filter_y[0] | filter_y[1] | filter_y[2]) || filter_y[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, \