diff options
Diffstat (limited to 'chromium/third_party/libaom/source/libaom/aom_dsp/x86/blend_a64_mask_avx2.c')
| -rw-r--r-- | chromium/third_party/libaom/source/libaom/aom_dsp/x86/blend_a64_mask_avx2.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chromium/third_party/libaom/source/libaom/aom_dsp/x86/blend_a64_mask_avx2.c b/chromium/third_party/libaom/source/libaom/aom_dsp/x86/blend_a64_mask_avx2.c index 057f615c20c..95383d2fd15 100644 --- a/chromium/third_party/libaom/source/libaom/aom_dsp/x86/blend_a64_mask_avx2.c +++ b/chromium/third_party/libaom/source/libaom/aom_dsp/x86/blend_a64_mask_avx2.c @@ -870,7 +870,7 @@ void aom_blend_a64_mask_avx2(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int w, - int h, int subx, int suby) { + int h, int subw, int subh) { assert(IMPLIES(src0 == dst, src0_stride == dst_stride)); assert(IMPLIES(src1 == dst, src1_stride == dst_stride)); @@ -881,15 +881,15 @@ void aom_blend_a64_mask_avx2(uint8_t *dst, uint32_t dst_stride, if (UNLIKELY((h | w) & 3)) { // if (w <= 2 || h <= 2) aom_blend_a64_mask_c(dst, dst_stride, src0, src0_stride, src1, src1_stride, - mask, mask_stride, w, h, subx, suby); + mask, mask_stride, w, h, subw, subh); } else { - if (subx & suby) { + if (subw & subh) { blend_a64_mask_sx_sy_avx2(dst, dst_stride, src0, src0_stride, src1, src1_stride, mask, mask_stride, w, h); - } else if (subx) { + } else if (subw) { blend_a64_mask_sx_avx2(dst, dst_stride, src0, src0_stride, src1, src1_stride, mask, mask_stride, w, h); - } else if (suby) { + } else if (subh) { blend_a64_mask_sy_avx2(dst, dst_stride, src0, src0_stride, src1, src1_stride, mask, mask_stride, w, h); } else { @@ -899,6 +899,7 @@ void aom_blend_a64_mask_avx2(uint8_t *dst, uint32_t dst_stride, } } +#if CONFIG_AV1_HIGHBITDEPTH ////////////////////////////////////////////////////////////////////////////// // aom_highbd_blend_a64_d16_mask_avx2() ////////////////////////////////////////////////////////////////////////////// @@ -1370,3 +1371,4 @@ void aom_highbd_blend_a64_d16_mask_avx2( subh, conv_params, bd); } } +#endif // CONFIG_AV1_HIGHBITDEPTH |