Fix dspr2 rename changes. Fix unused variables

include/libyuv/row.h

 /*
  *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS. All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 337 matching lines @@
 #define HAS_ARGBSUBTRACTROW_NEON
 #define HAS_INTERPOLATEROW_NEON
 #define HAS_SOBELROW_NEON
 #define HAS_SOBELTOPLANEROW_NEON
 #define HAS_SOBELXROW_NEON
 #define HAS_SOBELXYROW_NEON
 #define HAS_SOBELYROW_NEON
 #endif
 
 // The following are available on Mips platforms:
-#if !defined(LIBYUV_DISABLE_dspr2) && defined(__dspr2__) && \
-    (_dspr2_SIM == _dspr2_SIM_ABI32) && (__dspr2_isa_rev < 6)
-#define HAS_COPYROW_dspr2
-#if defined(__dspr2_dsp) && (__dspr2_dsp_rev >= 2)
+#if !defined(LIBYUV_DISABLE_DSPR2) && defined(__mips__) && \
+    (_MIPS_SIM == _MIPS_SIM_ABI32) && (__mips_isa_rev < 6)
+#define HAS_COPYROW_MIPS
+#if defined(__mips_dsp) && (__mips_dsp_rev >= 2)
 #define HAS_I422TOARGBROW_DSPR2
 #define HAS_INTERPOLATEROW_DSPR2
 #define HAS_MIRRORROW_DSPR2
 #define HAS_MIRRORUVROW_DSPR2
 #define HAS_SPLITUVROW_DSPR2
 #define HAS_RGB24TOARGBROW_DSPR2
 #define HAS_RAWTOARGBROW_DSPR2
 #define HAS_RGB565TOARGBROW_DSPR2
 #define HAS_ARGB1555TOARGBROW_DSPR2
 #define HAS_ARGB4444TOARGBROW_DSPR2
 #define HAS_I444TOARGBROW_DSPR2
 #define HAS_I422TOARGB4444ROW_DSPR2
 #define HAS_I422TOARGB1555ROW_DSPR2
 #define HAS_NV12TOARGBROW_DSPR2
 #define HAS_BGRATOUVROW_DSPR2
 #define HAS_BGRATOYROW_DSPR2
 #define HAS_ABGRTOUVROW_DSPR2
 #define HAS_ARGBTOYROW_DSPR2
 #define HAS_ABGRTOYROW_DSPR2
 #define HAS_RGBATOUVROW_DSPR2
 #define HAS_RGBATOYROW_DSPR2
 #define HAS_ARGBTOUVROW_DSPR2
 #endif
 #endif
 
-#if !defined(LIBYUV_DISABLE_MSA) && defined(__dspr2_msa)
+#if !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa)
 #define HAS_ARGBMIRRORROW_MSA
 #define HAS_I422TOUYVYROW_MSA
 #define HAS_I422TOYUY2ROW_MSA
 #define HAS_MIRRORROW_MSA
 #define HAS_UYVYTOUVROW_MSA
 #define HAS_UYVYTOYROW_MSA
 #define HAS_YUY2TOUV422ROW_MSA
 #define HAS_YUY2TOUVROW_MSA
 #define HAS_YUY2TOYROW_MSA
 #define HAS_ARGB4444TOARGBROW_MSA
@@ skipping 1005 matching lines @@
                          int width);
 void MergeUVRow_Any_NEON(const uint8* src_u,
                          const uint8* src_v,
                          uint8* dst_uv,
                          int width);
 
 void CopyRow_SSE2(const uint8* src, uint8* dst, int count);
 void CopyRow_AVX(const uint8* src, uint8* dst, int count);
 void CopyRow_ERMS(const uint8* src, uint8* dst, int count);
 void CopyRow_NEON(const uint8* src, uint8* dst, int count);
-void CopyRow_dspr2(const uint8* src, uint8* dst, int count);
+void CopyRow_MIPS(const uint8* src, uint8* dst, int count);
 void CopyRow_C(const uint8* src, uint8* dst, int count);
 void CopyRow_Any_SSE2(const uint8* src, uint8* dst, int count);
 void CopyRow_Any_AVX(const uint8* src, uint8* dst, int count);
 void CopyRow_Any_NEON(const uint8* src, uint8* dst, int count);
 
 void CopyRow_16_C(const uint16* src, uint16* dst, int count);
 
 void ARGBCopyAlphaRow_C(const uint8* src_argb, uint8* dst_argb, int width);
 void ARGBCopyAlphaRow_SSE2(const uint8* src_argb, uint8* dst_argb, int width);
 void ARGBCopyAlphaRow_AVX2(const uint8* src_argb, uint8* dst_argb, int width);
@@ skipping 1665 matching lines @@
                                  int width,
                                  const uint8* luma,
                                  uint32 lumacoeff);
 
 #ifdef __cplusplus
 }  // extern "C"
 }  // namespace libyuv
 #endif
 
 #endif  // INCLUDE_LIBYUV_ROW_H_