ref: b3ceb629badb9f0720db71a3c8a3f564311fcc02
parent: 784eebb2d39c2f994b4ad0954cc0d800999eafda
author: James Zern <[email protected]>
date: Wed Feb 24 14:35:37 EST 2016
x86/convolve.h: change filter[] || chains to | Change-Id: I661f64390f232826857b259e7a67e77f5a3a91ad
--- a/vpx_dsp/x86/convolve.h
+++ b/vpx_dsp/x86/convolve.h
@@ -33,7 +33,7 @@
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 @@
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 @@
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 @@
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, \