diff options
| author | Frank Barchard <fbarchard@google.com> | 2016-02-05 14:49:54 -0800 |
|---|---|---|
| committer | Frank Barchard <fbarchard@google.com> | 2016-02-05 14:49:54 -0800 |
| commit | 0d880e5bc07cde197a5a0a4e1bb4bda408373f6f (patch) | |
| tree | 76e05e47017eb9ec5600cc5e819d54fe5ef3407a /source/scale_common.cc | |
| parent | af90e82155a42ec8239685ca8626c547c7173220 (diff) | |
| download | libyuv-0d880e5bc07cde197a5a0a4e1bb4bda408373f6f.tar.gz | |
rename MIPS_DSPR2 to DSPR2 for consistency
When attempting to normalize function names to end in Row_SIMD it was made
harder with MIPS_DSPR2 naming convention.
Other CPUs do not include the vendor. This should be named consistently.
Removed the DISABLE_MIPS in favour of DISABLE_ASM for consistency with other
processors.
TBR=harryjin@google.com
BUG=libyuv:562
Review URL: https://codereview.chromium.org/1677633002 .
Diffstat (limited to 'source/scale_common.cc')
| -rw-r--r-- | source/scale_common.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/scale_common.cc b/source/scale_common.cc index 30ff18c5..d3992df2 100644 --- a/source/scale_common.cc +++ b/source/scale_common.cc @@ -922,13 +922,13 @@ void ScalePlaneVertical(int src_height, } } #endif -#if defined(HAS_INTERPOLATEROW_MIPS_DSPR2) - if (TestCpuFlag(kCpuHasMIPS_DSPR2) && +#if defined(HAS_INTERPOLATEROW_DSPR2) + if (TestCpuFlag(kCpuHasDSPR2) && IS_ALIGNED(src_argb, 4) && IS_ALIGNED(src_stride, 4) && IS_ALIGNED(dst_argb, 4) && IS_ALIGNED(dst_stride, 4)) { - InterpolateRow = InterpolateRow_Any_MIPS_DSPR2; + InterpolateRow = InterpolateRow_Any_DSPR2; if (IS_ALIGNED(dst_width_bytes, 4)) { - InterpolateRow = InterpolateRow_MIPS_DSPR2; + InterpolateRow = InterpolateRow_DSPR2; } } #endif @@ -996,13 +996,13 @@ void ScalePlaneVertical_16(int src_height, } } #endif -#if defined(HAS_INTERPOLATEROW_16_MIPS_DSPR2) - if (TestCpuFlag(kCpuHasMIPS_DSPR2) && +#if defined(HAS_INTERPOLATEROW_16_DSPR2) + if (TestCpuFlag(kCpuHasDSPR2) && IS_ALIGNED(src_argb, 4) && IS_ALIGNED(src_stride, 4) && IS_ALIGNED(dst_argb, 4) && IS_ALIGNED(dst_stride, 4)) { - InterpolateRow = InterpolateRow_Any_16_MIPS_DSPR2; + InterpolateRow = InterpolateRow_Any_16_DSPR2; if (IS_ALIGNED(dst_width_bytes, 4)) { - InterpolateRow = InterpolateRow_16_MIPS_DSPR2; + InterpolateRow = InterpolateRow_16_DSPR2; } } #endif |