diff options
| author | James Bankoski <jimbankoski@google.com> | 2016-06-29 23:05:51 +0000 |
|---|---|---|
| committer | James Bankoski <jimbankoski@google.com> | 2016-06-29 23:09:10 +0000 |
| commit | 291033032ed1abf4f43ad52165caea31a35fb33d (patch) | |
| tree | 00e8c710cf4d7f1b29f4559dcea1b8082dc2cedf /third_party/libyuv/source/rotate_any.cc | |
| parent | b8f83282f8506ad3d839440341bbe683df7d2cf6 (diff) | |
| download | libvpx-291033032ed1abf4f43ad52165caea31a35fb33d.tar libvpx-291033032ed1abf4f43ad52165caea31a35fb33d.tar.gz libvpx-291033032ed1abf4f43ad52165caea31a35fb33d.tar.bz2 libvpx-291033032ed1abf4f43ad52165caea31a35fb33d.zip | |
Revert "libyuv: update to b8ddb5a2"
This reverts commit b8f83282f8506ad3d839440341bbe683df7d2cf6.
Update was to wrong version and still has:
BUG=webm:1252
Change-Id: I80f3a7c0581ab5e2dd1a84f7840e51d7c362afac
Diffstat (limited to 'third_party/libyuv/source/rotate_any.cc')
| -rw-r--r-- | third_party/libyuv/source/rotate_any.cc | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/third_party/libyuv/source/rotate_any.cc b/third_party/libyuv/source/rotate_any.cc index 31a74c315..4d6eb34e1 100644 --- a/third_party/libyuv/source/rotate_any.cc +++ b/third_party/libyuv/source/rotate_any.cc @@ -18,7 +18,7 @@ namespace libyuv { extern "C" { #endif -#define TANY(NAMEANY, TPOS_SIMD, MASK) \ +#define TANY(NAMEANY, TPOS_SIMD, TPOS_C, MASK) \ void NAMEANY(const uint8* src, int src_stride, \ uint8* dst, int dst_stride, int width) { \ int r = width & MASK; \ @@ -26,48 +26,23 @@ extern "C" { if (n > 0) { \ TPOS_SIMD(src, src_stride, dst, dst_stride, n); \ } \ - TransposeWx8_C(src + n, src_stride, dst + n * dst_stride, dst_stride, r);\ + TPOS_C(src + n, src_stride, dst + n * dst_stride, dst_stride, r); \ } #ifdef HAS_TRANSPOSEWX8_NEON -TANY(TransposeWx8_Any_NEON, TransposeWx8_NEON, 7) +TANY(TransposeWx8_Any_NEON, TransposeWx8_NEON, TransposeWx8_C, 7) #endif #ifdef HAS_TRANSPOSEWX8_SSSE3 -TANY(TransposeWx8_Any_SSSE3, TransposeWx8_SSSE3, 7) +TANY(TransposeWx8_Any_SSSE3, TransposeWx8_SSSE3, TransposeWx8_C, 7) #endif #ifdef HAS_TRANSPOSEWX8_FAST_SSSE3 -TANY(TransposeWx8_Fast_Any_SSSE3, TransposeWx8_Fast_SSSE3, 15) +TANY(TransposeWx8_Fast_Any_SSSE3, TransposeWx8_Fast_SSSE3, TransposeWx8_C, 15) #endif -#ifdef HAS_TRANSPOSEWX8_DSPR2 -TANY(TransposeWx8_Any_DSPR2, TransposeWx8_DSPR2, 7) +#ifdef HAS_TRANSPOSEWX8_MIPS_DSPR2 +TANY(TransposeWx8_Any_MIPS_DSPR2, TransposeWx8_MIPS_DSPR2, TransposeWx8_C, 7) #endif -#undef TANY - -#define TUVANY(NAMEANY, TPOS_SIMD, MASK) \ - void NAMEANY(const uint8* src, int src_stride, \ - uint8* dst_a, int dst_stride_a, \ - uint8* dst_b, int dst_stride_b, int width) { \ - int r = width & MASK; \ - int n = width - r; \ - if (n > 0) { \ - TPOS_SIMD(src, src_stride, dst_a, dst_stride_a, dst_b, dst_stride_b, \ - n); \ - } \ - TransposeUVWx8_C(src + n * 2, src_stride, \ - dst_a + n * dst_stride_a, dst_stride_a, \ - dst_b + n * dst_stride_b, dst_stride_b, r); \ - } -#ifdef HAS_TRANSPOSEUVWX8_NEON -TUVANY(TransposeUVWx8_Any_NEON, TransposeUVWx8_NEON, 7) -#endif -#ifdef HAS_TRANSPOSEUVWX8_SSE2 -TUVANY(TransposeUVWx8_Any_SSE2, TransposeUVWx8_SSE2, 7) -#endif -#ifdef HAS_TRANSPOSEUVWX8_DSPR2 -TUVANY(TransposeUVWx8_Any_DSPR2, TransposeUVWx8_DSPR2, 7) -#endif -#undef TUVANY +#undef TANY #ifdef __cplusplus } // extern "C" |