diff options
Diffstat (limited to 'media/libaom/src/aom_dsp/blend_a64_mask.c')
| -rw-r--r-- | media/libaom/src/aom_dsp/blend_a64_mask.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/media/libaom/src/aom_dsp/blend_a64_mask.c b/media/libaom/src/aom_dsp/blend_a64_mask.c index 992cc5c0c..32f2dc6d8 100644 --- a/media/libaom/src/aom_dsp/blend_a64_mask.c +++ b/media/libaom/src/aom_dsp/blend_a64_mask.c @@ -22,7 +22,7 @@ // as described for AOM_BLEND_A64 in aom_dsp/blend.h. src0 or src1 can // be the same as dst, or dst can be different from both sources. -// NOTE(david.barker): The input and output of aom_blend_a64_d32_mask_c() are +// NOTE(david.barker): The input and output of aom_blend_a64_d16_mask_c() are // in a higher intermediate precision, and will later be rounded down to pixel // precision. // Thus, in order to avoid double-rounding, we want to use normal right shifts @@ -30,7 +30,7 @@ // This works because of the identity: // ROUND_POWER_OF_TWO(x >> y, z) == ROUND_POWER_OF_TWO(x, y+z) // -// In contrast, the output of the non-d32 functions will not be further rounded, +// In contrast, the output of the non-d16 functions will not be further rounded, // so we *should* use ROUND_POWER_OF_TWO there. void aom_lowbd_blend_a64_d16_mask_c( @@ -120,6 +120,7 @@ void aom_lowbd_blend_a64_d16_mask_c( } } +#if CONFIG_AV1_HIGHBITDEPTH void aom_highbd_blend_a64_d16_mask_c( uint8_t *dst_8, uint32_t dst_stride, const CONV_BUF_TYPE *src0, uint32_t src0_stride, const CONV_BUF_TYPE *src1, uint32_t src1_stride, @@ -219,6 +220,7 @@ void aom_highbd_blend_a64_d16_mask_c( } } } +#endif // CONFIG_AV1_HIGHBITDEPTH // Blending with alpha mask. Mask values come from the range [0, 64], // as described for AOM_BLEND_A64 in aom_dsp/blend.h. src0 or src1 can @@ -281,6 +283,7 @@ void aom_blend_a64_mask_c(uint8_t *dst, uint32_t dst_stride, } } +#if CONFIG_AV1_HIGHBITDEPTH void aom_highbd_blend_a64_mask_c(uint8_t *dst_8, uint32_t dst_stride, const uint8_t *src0_8, uint32_t src0_stride, const uint8_t *src1_8, uint32_t src1_stride, @@ -343,3 +346,4 @@ void aom_highbd_blend_a64_mask_c(uint8_t *dst_8, uint32_t dst_stride, } } } +#endif // CONFIG_AV1_HIGHBITDEPTH |