diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
| commit | ec910d81405c736a4490383a250299a7837c2e64 (patch) | |
| tree | 4f27cc226f93a863121aef6c56313e4153a69b3e /third_party/aom/aom_dsp/sad.c | |
| parent | 01eb57073ba97b2d6cbf20f745dfcc508197adc3 (diff) | |
| download | UXP-ec910d81405c736a4490383a250299a7837c2e64.tar UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.gz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.lz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.xz UXP-ec910d81405c736a4490383a250299a7837c2e64.zip | |
Update aom to commit id e87fb2378f01103d5d6e477a4ef6892dc714e614
Diffstat (limited to 'third_party/aom/aom_dsp/sad.c')
| -rw-r--r-- | third_party/aom/aom_dsp/sad.c | 44 |
1 files changed, 38 insertions, 6 deletions
diff --git a/third_party/aom/aom_dsp/sad.c b/third_party/aom/aom_dsp/sad.c index b9c789ce5..6b8ca669b 100644 --- a/third_party/aom/aom_dsp/sad.c +++ b/third_party/aom/aom_dsp/sad.c @@ -163,11 +163,19 @@ sadMxN(8, 32) sadMxNx4D(8, 32) sadMxN(32, 8) sadMxNx4D(32, 8) +sadMxN(16, 64) +sadMxNx4D(16, 64) +sadMxN(64, 16) +sadMxNx4D(64, 16) +sadMxN(32, 128) +sadMxNx4D(32, 128) +sadMxN(128, 32) +sadMxNx4D(128, 32) #endif /* clang-format on */ #if CONFIG_HIGHBITDEPTH - static INLINE + static INLINE unsigned int highbd_sad(const uint8_t *a8, int a_stride, const uint8_t *b8, int b_stride, int width, int height) { int y, x; @@ -328,12 +336,20 @@ highbd_sadMxN(8, 32) highbd_sadMxNx4D(8, 32) highbd_sadMxN(32, 8) highbd_sadMxNx4D(32, 8) +highbd_sadMxN(16, 64) +highbd_sadMxNx4D(16, 64) +highbd_sadMxN(64, 16) +highbd_sadMxNx4D(64, 16) +highbd_sadMxN(32, 128) +highbd_sadMxNx4D(32, 128) +highbd_sadMxN(128, 32) +highbd_sadMxNx4D(128, 32) #endif /* clang-format on */ #endif // CONFIG_HIGHBITDEPTH -#if CONFIG_AV1 && CONFIG_EXT_INTER - static INLINE +#if CONFIG_AV1 + static INLINE unsigned int masked_sad(const uint8_t *src, int src_stride, const uint8_t *a, int a_stride, const uint8_t *b, int b_stride, const uint8_t *m, int m_stride, @@ -395,11 +411,15 @@ MASKSADMxN(4, 16) MASKSADMxN(16, 4) MASKSADMxN(8, 32) MASKSADMxN(32, 8) +MASKSADMxN(16, 64) +MASKSADMxN(64, 16) +MASKSADMxN(32, 128) +MASKSADMxN(128, 32) #endif /* clang-format on */ #if CONFIG_HIGHBITDEPTH - static INLINE + static INLINE unsigned int highbd_masked_sad(const uint8_t *src8, int src_stride, const uint8_t *a8, int a_stride, const uint8_t *b8, int b_stride, @@ -464,9 +484,13 @@ HIGHBD_MASKSADMXN(4, 16) HIGHBD_MASKSADMXN(16, 4) HIGHBD_MASKSADMXN(8, 32) HIGHBD_MASKSADMXN(32, 8) +HIGHBD_MASKSADMXN(16, 64) +HIGHBD_MASKSADMXN(64, 16) +HIGHBD_MASKSADMXN(32, 128) +HIGHBD_MASKSADMXN(128, 32) #endif #endif // CONFIG_HIGHBITDEPTH -#endif // CONFIG_AV1 && CONFIG_EXT_INTER +#endif // CONFIG_AV1 #if CONFIG_AV1 && CONFIG_MOTION_VAR // pre: predictor being evaluated @@ -522,11 +546,15 @@ OBMCSADMxN(4, 16) OBMCSADMxN(16, 4) OBMCSADMxN(8, 32) OBMCSADMxN(32, 8) +OBMCSADMxN(16, 64) +OBMCSADMxN(64, 16) +OBMCSADMxN(32, 128) +OBMCSADMxN(128, 32) #endif /* clang-format on */ #if CONFIG_HIGHBITDEPTH - static INLINE + static INLINE unsigned int highbd_obmc_sad(const uint8_t *pre8, int pre_stride, const int32_t *wsrc, const int32_t *mask, int width, int height) { @@ -578,6 +606,10 @@ HIGHBD_OBMCSADMXN(4, 16) HIGHBD_OBMCSADMXN(16, 4) HIGHBD_OBMCSADMXN(8, 32) HIGHBD_OBMCSADMXN(32, 8) +HIGHBD_OBMCSADMXN(16, 64) +HIGHBD_OBMCSADMXN(64, 16) +HIGHBD_OBMCSADMXN(32, 128) +HIGHBD_OBMCSADMXN(128, 32) #endif /* clang-format on */ #endif // CONFIG_HIGHBITDEPTH |