Fix dspr2 rename changes. Fix unused variables

TBR=kjellander@chromium.org
BUG=libyuv:634
TEST=try bots

Review-Url: https://codereview.chromium.org/2675583002 .

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1642
+Version: 1643
 License: BSD
 License File: LICENSE
 

include/libyuv/row.h

@@ -355,10 +355,10 @@ extern "C" {
 #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
@@ -384,7 +384,7 @@ extern "C" {
 #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
@@ -1410,7 +1410,7 @@ 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);

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1642
+#define LIBYUV_VERSION 1643
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_

source/scale_msa.cc

@@ -223,7 +223,7 @@ void ScaleRowDown2Box_MSA(const uint8_t* src_ptr,
   const uint8_t* s = src_ptr;
   const uint8_t* t = src_ptr + src_stride;
   v16u8 src0, src1, src2, src3, src4, src5, src6, src7, dst0, dst1;
-  v8u16 vec0, vec1, vec2, vec3, vec4, vec5, vec6, vec7;
+  v8u16 vec0, vec1, vec2, vec3;
 
   for (x = 0; x < dst_width; x += 32) {
     src0 = (v16u8)__msa_ld_b((v16i8*)s, 0);
@@ -521,7 +521,7 @@ void ScaleRowDown38_3_Box_MSA(const uint8_t* src_ptr,
 void ScaleAddRow_MSA(const uint8_t* src_ptr, uint16_t* dst_ptr, int src_width) {
   int x;
   v16u8 src0;
-  v8u16 vec0, vec1, dst0, dst1;
+  v8u16 dst0, dst1;
   v16i8 zero = {0};
 
   assert(src_width > 0);