diff --git a/libswscale/ops_tmpl_common.c b/libswscale/ops_tmpl_common.c index b8b202e6e6..a97f031cdb 100644 --- a/libswscale/ops_tmpl_common.c +++ b/libswscale/ops_tmpl_common.c @@ -65,13 +65,13 @@ DECL_PATTERN(clear) { SWS_LOOP for (int i = 0; i < SWS_BLOCK_SIZE; i++) { - if (!X) + if (X) x[i] = impl->priv.px[0]; - if (!Y) + if (Y) y[i] = impl->priv.px[1]; - if (!Z) + if (Z) z[i] = impl->priv.px[2]; - if (!W) + if (W) w[i] = impl->priv.px[3]; } @@ -84,22 +84,22 @@ DECL_IMPL(clear, clear##_##X##Y##Z##W, X, Y, Z, W) DECL_ENTRY(clear##_##X##Y##Z##W, SWS_COMP_ALL, \ .setup = ff_sws_setup_clear, \ .op = SWS_OP_CLEAR, \ - .clear.mask = SWS_COMP_MASK(!X, !Y, !Z, !W), \ + .clear.mask = SWS_COMP_MASK(X, Y, Z, W), \ ); -WRAP_CLEAR(1, 1, 1, 0) /* rgba alpha */ -WRAP_CLEAR(0, 1, 1, 1) /* argb alpha */ -WRAP_CLEAR(1, 0, 1, 1) /* ya alpha */ +WRAP_CLEAR(0, 0, 0, 1) /* rgba alpha */ +WRAP_CLEAR(1, 0, 0, 0) /* argb alpha */ +WRAP_CLEAR(0, 1, 0, 0) /* ya alpha */ -WRAP_CLEAR(0, 0, 1, 1) /* vuya chroma */ -WRAP_CLEAR(1, 0, 0, 1) /* yuva chroma */ -WRAP_CLEAR(1, 1, 0, 0) /* ayuv chroma */ -WRAP_CLEAR(0, 1, 0, 1) /* uyva chroma */ -WRAP_CLEAR(1, 0, 1, 0) /* xvyu chroma */ +WRAP_CLEAR(1, 1, 0, 0) /* vuya chroma */ +WRAP_CLEAR(0, 1, 1, 0) /* yuva chroma */ +WRAP_CLEAR(0, 0, 1, 1) /* ayuv chroma */ +WRAP_CLEAR(1, 0, 1, 0) /* uyva chroma */ +WRAP_CLEAR(0, 1, 0, 1) /* xvyu chroma */ -WRAP_CLEAR(1, 0, 0, 0) /* gray -> yuva */ -WRAP_CLEAR(0, 1, 0, 0) /* gray -> ayuv */ -WRAP_CLEAR(0, 0, 1, 0) /* gray -> vuya */ +WRAP_CLEAR(0, 1, 1, 1) /* gray -> yuva */ +WRAP_CLEAR(1, 0, 1, 1) /* gray -> ayuv */ +WRAP_CLEAR(1, 1, 0, 1) /* gray -> vuya */ DECL_PATTERN(min) { diff --git a/libswscale/ops_tmpl_float.c b/libswscale/ops_tmpl_float.c index 9e98534383..d2a196873e 100644 --- a/libswscale/ops_tmpl_float.c +++ b/libswscale/ops_tmpl_float.c @@ -218,7 +218,7 @@ static const SwsOpTable fn(op_table_float) = { REF_COMMON_PATTERNS(convert_uint16), REF_COMMON_PATTERNS(convert_uint32), - &fn(op_clear_1110), + &fn(op_clear_0001), REF_COMMON_PATTERNS(min), REF_COMMON_PATTERNS(max), REF_COMMON_PATTERNS(scale), @@ -233,9 +233,9 @@ static const SwsOpTable fn(op_table_float) = { &fn(op_dither7), &fn(op_dither8), - &fn(op_clear_1110), - &fn(op_clear_0111), - &fn(op_clear_0011), + &fn(op_clear_0001), + &fn(op_clear_1000), + &fn(op_clear_1100), &fn(op_linear_luma), &fn(op_linear_alpha), diff --git a/libswscale/ops_tmpl_int.c b/libswscale/ops_tmpl_int.c index 1cf6bc0f9d..3e98c1f5ae 100644 --- a/libswscale/ops_tmpl_int.c +++ b/libswscale/ops_tmpl_int.c @@ -554,17 +554,17 @@ static const SwsOpTable fn(op_table_int) = { REF_COMMON_PATTERNS(scale), REF_COMMON_PATTERNS(convert_float), - &fn(op_clear_1110), - &fn(op_clear_0111), - &fn(op_clear_0011), - &fn(op_clear_1011), - &fn(op_clear_1001), - &fn(op_clear_1100), - &fn(op_clear_0101), - &fn(op_clear_1010), + &fn(op_clear_0001), &fn(op_clear_1000), + &fn(op_clear_1100), &fn(op_clear_0100), - &fn(op_clear_0010), + &fn(op_clear_0110), + &fn(op_clear_0011), + &fn(op_clear_1010), + &fn(op_clear_0101), + &fn(op_clear_0111), + &fn(op_clear_1011), + &fn(op_clear_1101), &fn(op_swizzle_3012), &fn(op_swizzle_3021),