| Index: include/libyuv/row.h
|
| diff --git a/include/libyuv/row.h b/include/libyuv/row.h
|
| index 6a13393a65d914c6e27845c06181ef9e50704080..bdeffb6b08b1a3553fc5108e45d855f20108ca50 100644
|
| --- a/include/libyuv/row.h
|
| +++ b/include/libyuv/row.h
|
| @@ -174,7 +174,7 @@ extern "C" {
|
| // The following functions fail on gcc/clang 32 bit with fpic and framepointer.
|
| // caveat: clangcl uses row_win.cc which works.
|
| #if defined(NDEBUG) || !(defined(_DEBUG) && defined(__i386__)) || \
|
| - !defined(__i386__) || defined(_MSC_VER)
|
| + !defined(__i386__) || defined(_MSC_VER)
|
| // TODO(fbarchard): fix build error on x86 debug
|
| // https://code.google.com/p/libyuv/issues/detail?id=524
|
| #define HAS_I411TOARGBROW_SSSE3
|
| @@ -355,11 +355,11 @@ extern "C" {
|
| (_MIPS_SIM == _MIPS_SIM_ABI32) && (__mips_isa_rev < 6)
|
| #define HAS_COPYROW_MIPS
|
| #if defined(__mips_dsp) && (__mips_dsp_rev >= 2)
|
| -#define HAS_I422TOARGBROW_MIPS_DSPR2
|
| -#define HAS_INTERPOLATEROW_MIPS_DSPR2
|
| -#define HAS_MIRRORROW_MIPS_DSPR2
|
| -#define HAS_MIRRORUVROW_MIPS_DSPR2
|
| -#define HAS_SPLITUVROW_MIPS_DSPR2
|
| +#define HAS_I422TOARGBROW_DSPR2
|
| +#define HAS_INTERPOLATEROW_DSPR2
|
| +#define HAS_MIRRORROW_DSPR2
|
| +#define HAS_MIRRORUVROW_DSPR2
|
| +#define HAS_SPLITUVROW_DSPR2
|
| #endif
|
| #endif
|
|
|
| @@ -790,7 +790,7 @@ void ARGBToUV411Row_C(const uint8* src_argb,
|
| void MirrorRow_AVX2(const uint8* src, uint8* dst, int width);
|
| void MirrorRow_SSSE3(const uint8* src, uint8* dst, int width);
|
| void MirrorRow_NEON(const uint8* src, uint8* dst, int width);
|
| -void MirrorRow_MIPS_DSPR2(const uint8* src, uint8* dst, int width);
|
| +void MirrorRow_DSPR2(const uint8* src, uint8* dst, int width);
|
| void MirrorRow_C(const uint8* src, uint8* dst, int width);
|
| void MirrorRow_Any_AVX2(const uint8* src, uint8* dst, int width);
|
| void MirrorRow_Any_SSSE3(const uint8* src, uint8* dst, int width);
|
| @@ -801,10 +801,9 @@ void MirrorUVRow_SSSE3(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| int width);
|
| void MirrorUVRow_NEON(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| int width);
|
| -void MirrorUVRow_MIPS_DSPR2(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| - int width);
|
| -void MirrorUVRow_C(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| - int width);
|
| +void MirrorUVRow_DSPR2(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| + int width);
|
| +void MirrorUVRow_C(const uint8* src_uv, uint8* dst_u, uint8* dst_v, int width);
|
|
|
| void ARGBMirrorRow_AVX2(const uint8* src, uint8* dst, int width);
|
| void ARGBMirrorRow_SSE2(const uint8* src, uint8* dst, int width);
|
| @@ -821,16 +820,16 @@ void SplitUVRow_AVX2(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| int width);
|
| void SplitUVRow_NEON(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| int width);
|
| -void SplitUVRow_MIPS_DSPR2(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| - int width);
|
| +void SplitUVRow_DSPR2(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| + int width);
|
| void SplitUVRow_Any_SSE2(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| int width);
|
| void SplitUVRow_Any_AVX2(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| int width);
|
| void SplitUVRow_Any_NEON(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| int width);
|
| -void SplitUVRow_Any_MIPS_DSPR2(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| - int width);
|
| +void SplitUVRow_Any_DSPR2(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
|
| + int width);
|
|
|
| void MergeUVRow_C(const uint8* src_u, const uint8* src_v, uint8* dst_uv,
|
| int width);
|
| @@ -1610,18 +1609,18 @@ void UYVYToARGBRow_Any_NEON(const uint8* src_uyvy,
|
| uint8* dst_argb,
|
| const struct YuvConstants* yuvconstants,
|
| int width);
|
| -void I422ToARGBRow_MIPS_DSPR2(const uint8* src_y,
|
| - const uint8* src_u,
|
| - const uint8* src_v,
|
| - uint8* dst_argb,
|
| - const struct YuvConstants* yuvconstants,
|
| - int width);
|
| -void I422ToARGBRow_MIPS_DSPR2(const uint8* src_y,
|
| - const uint8* src_u,
|
| - const uint8* src_v,
|
| - uint8* dst_argb,
|
| - const struct YuvConstants* yuvconstants,
|
| - int width);
|
| +void I422ToARGBRow_DSPR2(const uint8* src_y,
|
| + const uint8* src_u,
|
| + const uint8* src_v,
|
| + uint8* dst_argb,
|
| + const struct YuvConstants* yuvconstants,
|
| + int width);
|
| +void I422ToARGBRow_DSPR2(const uint8* src_y,
|
| + const uint8* src_u,
|
| + const uint8* src_v,
|
| + uint8* dst_argb,
|
| + const struct YuvConstants* yuvconstants,
|
| + int width);
|
|
|
| void YUY2ToYRow_AVX2(const uint8* src_yuy2, uint8* dst_y, int width);
|
| void YUY2ToUVRow_AVX2(const uint8* src_yuy2, int stride_yuy2,
|
| @@ -1831,7 +1830,7 @@ void InterpolateRow_AVX2(uint8* dst_ptr, const uint8* src_ptr,
|
| void InterpolateRow_NEON(uint8* dst_ptr, const uint8* src_ptr,
|
| ptrdiff_t src_stride_ptr, int width,
|
| int source_y_fraction);
|
| -void InterpolateRow_MIPS_DSPR2(uint8* dst_ptr, const uint8* src_ptr,
|
| +void InterpolateRow_DSPR2(uint8* dst_ptr, const uint8* src_ptr,
|
| ptrdiff_t src_stride_ptr, int width,
|
| int source_y_fraction);
|
| void InterpolateRow_Any_NEON(uint8* dst_ptr, const uint8* src_ptr,
|
| @@ -1843,9 +1842,9 @@ void InterpolateRow_Any_SSSE3(uint8* dst_ptr, const uint8* src_ptr,
|
| void InterpolateRow_Any_AVX2(uint8* dst_ptr, const uint8* src_ptr,
|
| ptrdiff_t src_stride_ptr, int width,
|
| int source_y_fraction);
|
| -void InterpolateRow_Any_MIPS_DSPR2(uint8* dst_ptr, const uint8* src_ptr,
|
| - ptrdiff_t src_stride_ptr, int width,
|
| - int source_y_fraction);
|
| +void InterpolateRow_Any_DSPR2(uint8* dst_ptr, const uint8* src_ptr,
|
| + ptrdiff_t src_stride_ptr, int width,
|
| + int source_y_fraction);
|
|
|
| void InterpolateRow_16_C(uint16* dst_ptr, const uint16* src_ptr,
|
| ptrdiff_t src_stride_ptr,
|
|
|