| Index: source/convert_argb.cc
|
| diff --git a/source/convert_argb.cc b/source/convert_argb.cc
|
| index cf3d7228905758c09b5f48fe037696c3619bd6d7..e586f7043ce0e5b49ee022510bf40a3e4ff7eb4d 100644
|
| --- a/source/convert_argb.cc
|
| +++ b/source/convert_argb.cc
|
| @@ -92,13 +92,13 @@ static int I420ToARGBMatrix(const uint8* src_y, int src_stride_y,
|
| }
|
| }
|
| #endif
|
| -#if defined(HAS_I422TOARGBROW_MIPS_DSPR2)
|
| - if (TestCpuFlag(kCpuHasMIPS_DSPR2) && IS_ALIGNED(width, 4) &&
|
| +#if defined(HAS_I422TOARGBROW_DSPR2)
|
| + if (TestCpuFlag(kCpuHasDSPR2) && IS_ALIGNED(width, 4) &&
|
| IS_ALIGNED(src_y, 4) && IS_ALIGNED(src_stride_y, 4) &&
|
| IS_ALIGNED(src_u, 2) && IS_ALIGNED(src_stride_u, 2) &&
|
| IS_ALIGNED(src_v, 2) && IS_ALIGNED(src_stride_v, 2) &&
|
| IS_ALIGNED(dst_argb, 4) && IS_ALIGNED(dst_stride_argb, 4)) {
|
| - I422ToARGBRow = I422ToARGBRow_MIPS_DSPR2;
|
| + I422ToARGBRow = I422ToARGBRow_DSPR2;
|
| }
|
| #endif
|
|
|
| @@ -262,13 +262,13 @@ static int I422ToARGBMatrix(const uint8* src_y, int src_stride_y,
|
| }
|
| }
|
| #endif
|
| -#if defined(HAS_I422TOARGBROW_MIPS_DSPR2)
|
| - if (TestCpuFlag(kCpuHasMIPS_DSPR2) && IS_ALIGNED(width, 4) &&
|
| +#if defined(HAS_I422TOARGBROW_DSPR2)
|
| + if (TestCpuFlag(kCpuHasDSPR2) && IS_ALIGNED(width, 4) &&
|
| IS_ALIGNED(src_y, 4) && IS_ALIGNED(src_stride_y, 4) &&
|
| IS_ALIGNED(src_u, 2) && IS_ALIGNED(src_stride_u, 2) &&
|
| IS_ALIGNED(src_v, 2) && IS_ALIGNED(src_stride_v, 2) &&
|
| IS_ALIGNED(dst_argb, 4) && IS_ALIGNED(dst_stride_argb, 4)) {
|
| - I422ToARGBRow = I422ToARGBRow_MIPS_DSPR2;
|
| + I422ToARGBRow = I422ToARGBRow_DSPR2;
|
| }
|
| #endif
|
|
|
| @@ -607,13 +607,13 @@ static int I420AlphaToARGBMatrix(const uint8* src_y, int src_stride_y,
|
| }
|
| }
|
| #endif
|
| -#if defined(HAS_I422ALPHATOARGBROW_MIPS_DSPR2)
|
| - if (TestCpuFlag(kCpuHasMIPS_DSPR2) && IS_ALIGNED(width, 4) &&
|
| +#if defined(HAS_I422ALPHATOARGBROW_DSPR2)
|
| + if (TestCpuFlag(kCpuHasDSPR2) && IS_ALIGNED(width, 4) &&
|
| IS_ALIGNED(src_y, 4) && IS_ALIGNED(src_stride_y, 4) &&
|
| IS_ALIGNED(src_u, 2) && IS_ALIGNED(src_stride_u, 2) &&
|
| IS_ALIGNED(src_v, 2) && IS_ALIGNED(src_stride_v, 2) &&
|
| IS_ALIGNED(dst_argb, 4) && IS_ALIGNED(dst_stride_argb, 4)) {
|
| - I422AlphaToARGBRow = I422AlphaToARGBRow_MIPS_DSPR2;
|
| + I422AlphaToARGBRow = I422AlphaToARGBRow_DSPR2;
|
| }
|
| #endif
|
| #if defined(HAS_ARGBATTENUATEROW_SSSE3)
|
|
|