diff options
Diffstat (limited to 'third_party/aom/aom_dsp/variance.c')
| -rw-r--r-- | third_party/aom/aom_dsp/variance.c | 60 |
1 files changed, 52 insertions, 8 deletions
diff --git a/third_party/aom/aom_dsp/variance.c b/third_party/aom/aom_dsp/variance.c index a4c3616e7..3c99aa155 100644 --- a/third_party/aom/aom_dsp/variance.c +++ b/third_party/aom/aom_dsp/variance.c @@ -256,7 +256,13 @@ VARIANCES(4, 16) VARIANCES(16, 4) VARIANCES(8, 32) VARIANCES(32, 8) -#endif +VARIANCES(16, 64) +VARIANCES(64, 16) +#if CONFIG_EXT_PARTITION +VARIANCES(32, 128) +VARIANCES(128, 32) +#endif // CONFIG_EXT_PARTITION +#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES GET_VAR(16, 16) GET_VAR(8, 8) @@ -661,7 +667,13 @@ HIGHBD_VARIANCES(4, 16) HIGHBD_VARIANCES(16, 4) HIGHBD_VARIANCES(8, 32) HIGHBD_VARIANCES(32, 8) -#endif +HIGHBD_VARIANCES(16, 64) +HIGHBD_VARIANCES(64, 16) +#if CONFIG_EXT_PARTITION +HIGHBD_VARIANCES(32, 128) +HIGHBD_VARIANCES(128, 32) +#endif // CONFIG_EXT_PARTITION +#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES HIGHBD_GET_VAR(8) HIGHBD_GET_VAR(16) @@ -761,7 +773,7 @@ void aom_highbd_comp_avg_upsampled_pred_c(uint16_t *comp_pred, } #endif // CONFIG_HIGHBITDEPTH -#if CONFIG_AV1 && CONFIG_EXT_INTER +#if CONFIG_AV1 void aom_comp_mask_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride, const uint8_t *mask, int mask_stride, @@ -848,7 +860,13 @@ MASK_SUBPIX_VAR(4, 16) MASK_SUBPIX_VAR(16, 4) MASK_SUBPIX_VAR(8, 32) MASK_SUBPIX_VAR(32, 8) -#endif +MASK_SUBPIX_VAR(16, 64) +MASK_SUBPIX_VAR(64, 16) +#if CONFIG_EXT_PARTITION +MASK_SUBPIX_VAR(32, 128) +MASK_SUBPIX_VAR(128, 32) +#endif // CONFIG_EXT_PARTITION +#endif // CONFIG_EXT_PARTITION_TYPES #if CONFIG_HIGHBITDEPTH void aom_highbd_comp_mask_pred_c(uint16_t *comp_pred, const uint8_t *pred8, @@ -985,9 +1003,15 @@ HIGHBD_MASK_SUBPIX_VAR(4, 16) HIGHBD_MASK_SUBPIX_VAR(16, 4) HIGHBD_MASK_SUBPIX_VAR(8, 32) HIGHBD_MASK_SUBPIX_VAR(32, 8) -#endif +HIGHBD_MASK_SUBPIX_VAR(16, 64) +HIGHBD_MASK_SUBPIX_VAR(64, 16) +#if CONFIG_EXT_PARTITION +HIGHBD_MASK_SUBPIX_VAR(32, 128) +HIGHBD_MASK_SUBPIX_VAR(128, 32) +#endif // CONFIG_EXT_PARTITION +#endif // CONFIG_EXT_PARTITION_TYPES #endif // CONFIG_HIGHBITDEPTH -#endif // CONFIG_AV1 && CONFIG_EXT_INTER +#endif // CONFIG_AV1 #if CONFIG_AV1 && CONFIG_MOTION_VAR static INLINE void obmc_variance(const uint8_t *pre, int pre_stride, @@ -1094,7 +1118,17 @@ OBMC_VAR(8, 32) OBMC_SUBPIX_VAR(8, 32) OBMC_VAR(32, 8) OBMC_SUBPIX_VAR(32, 8) -#endif +OBMC_VAR(16, 64) +OBMC_SUBPIX_VAR(16, 64) +OBMC_VAR(64, 16) +OBMC_SUBPIX_VAR(64, 16) +#if CONFIG_EXT_PARTITION +OBMC_VAR(32, 128) +OBMC_SUBPIX_VAR(32, 128) +OBMC_VAR(128, 32) +OBMC_SUBPIX_VAR(128, 32) +#endif // CONFIG_EXT_PARTITION +#endif // CONFIG_EXT_PARTITION_TYPES #if CONFIG_HIGHBITDEPTH static INLINE void highbd_obmc_variance64(const uint8_t *pre8, int pre_stride, @@ -1287,6 +1321,16 @@ HIGHBD_OBMC_VAR(8, 32) HIGHBD_OBMC_SUBPIX_VAR(8, 32) HIGHBD_OBMC_VAR(32, 8) HIGHBD_OBMC_SUBPIX_VAR(32, 8) -#endif +HIGHBD_OBMC_VAR(16, 64) +HIGHBD_OBMC_SUBPIX_VAR(16, 64) +HIGHBD_OBMC_VAR(64, 16) +HIGHBD_OBMC_SUBPIX_VAR(64, 16) +#if CONFIG_EXT_PARTITION +HIGHBD_OBMC_VAR(32, 128) +HIGHBD_OBMC_SUBPIX_VAR(32, 128) +HIGHBD_OBMC_VAR(128, 32) +HIGHBD_OBMC_SUBPIX_VAR(128, 32) +#endif // CONFIG_EXT_PARTITION +#endif // CONFIG_EXT_PARTITION_TYPES #endif // CONFIG_HIGHBITDEPTH #endif // CONFIG_AV1 && CONFIG_MOTION_VAR |