diff --git a/README.chromium b/README.chromium index 340f274bd..3eb868bdc 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 555 +Version: 556 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 0ca84e1d7..7c36a714c 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 555 +#define LIBYUV_VERSION 556 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/convert.cc b/source/convert.cc index a284fb814..7c70b5006 100644 --- a/source/convert.cc +++ b/source/convert.cc @@ -310,6 +310,11 @@ static void CopyPlane2(const uint8* src, int src_stride_0, int src_stride_1, #endif } #endif +#if defined(HAS_COPYROW_MIPS) + if (TestCpuFlag(kCpuHasMIPS)) { + CopyRow = CopyRow_MIPS; + } +#endif // Copy plane for (int y = 0; y < height - 1; y += 2) { @@ -514,6 +519,11 @@ int Q420ToI420(const uint8* src_y, int src_stride_y, CopyRow = CopyRow_SSE2; } #endif +#if defined(HAS_COPYROW_MIPS) + if (TestCpuFlag(kCpuHasMIPS)) { + CopyRow = CopyRow_MIPS; + } +#endif void (*YUY2ToUV422Row)(const uint8* src_yuy2, uint8* dst_u, uint8* dst_v, int pix) = YUY2ToUV422Row_C; diff --git a/source/convert_from.cc b/source/convert_from.cc index ecddaab8c..c29903fee 100644 --- a/source/convert_from.cc +++ b/source/convert_from.cc @@ -68,6 +68,11 @@ int I420ToI422(const uint8* src_y, int src_stride_y, #endif } #endif +#if defined(HAS_COPYROW_MIPS) + if (TestCpuFlag(kCpuHasMIPS)) { + CopyRow = CopyRow_MIPS; + } +#endif // Copy Y plane if (dst_y) { diff --git a/source/rotate.cc b/source/rotate.cc index d141767e9..4d0ac9d3b 100644 --- a/source/rotate.cc +++ b/source/rotate.cc @@ -906,6 +906,11 @@ void RotatePlane180(const uint8* src, int src_stride, IS_ALIGNED(dst, 16) && IS_ALIGNED(dst_stride, 16)) { CopyRow = CopyRow_SSE2; } +#endif +#if defined(HAS_COPYROW_MIPS) + if (TestCpuFlag(kCpuHasMIPS)) { + CopyRow = CopyRow_MIPS; + } #endif if (width > kMaxStride) { return; diff --git a/source/rotate_argb.cc b/source/rotate_argb.cc index 880d1eaf3..02f928ecd 100644 --- a/source/rotate_argb.cc +++ b/source/rotate_argb.cc @@ -120,6 +120,11 @@ void ARGBRotate180(const uint8* src, int src_stride, IS_ALIGNED(dst, 16) && IS_ALIGNED(dst_stride, 16)) { CopyRow = CopyRow_SSE2; } +#endif +#if defined(HAS_COPYROW_MIPS) + if (TestCpuFlag(kCpuHasMIPS)) { + CopyRow = CopyRow_MIPS; + } #endif if (width * 4 > kMaxStride) { return;