avx2 width parameter bug fix

R=harryjin@google.com
BUG=libyuv:489

Review URL: https://codereview.chromium.org/1321773004 .

README.chromium

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

include/libyuv/row.h

@@ -202,9 +202,9 @@ extern "C" {
 #define HAS_ARGBTORGB565DITHERROW_SSE2
 #define HAS_ARGBTORGB565ROW_AVX2
 #define HAS_I411TOARGBROW_AVX2
-//#define HAS_I422TOARGB1555ROW_AVX2
-//#define HAS_I422TOARGB4444ROW_AVX2
-//#define HAS_I422TORGB565ROW_AVX2
+#define HAS_I422TOARGB1555ROW_AVX2
+#define HAS_I422TOARGB4444ROW_AVX2
+#define HAS_I422TORGB565ROW_AVX2
 #define HAS_I444TOARGBROW_AVX2
 #define HAS_J400TOARGBROW_AVX2
 #define HAS_NV12TOARGBROW_AVX2
@@ -229,28 +229,27 @@ extern "C" {
 #define HAS_ARGBTOYROW_AVX2
 #define HAS_COPYROW_AVX
 #define HAS_I400TOARGBROW_AVX2
-// bug 489 - AVX2 version fails
-//#define HAS_I422TOABGRROW_AVX2
-//#define HAS_I422TOARGBROW_AVX2
-//#define HAS_I422TOARGBMATRIXROW_AVX2
-//#define HAS_I422TOABGRMATRIXROW_AVX2
+#define HAS_I422TOABGRROW_AVX2
+#define HAS_I422TOARGBROW_AVX2
+#define HAS_I422TOARGBMATRIXROW_AVX2
+#define HAS_I422TOABGRMATRIXROW_AVX2
 #define HAS_I422TOBGRAROW_AVX2
-//#define HAS_I422TORAWROW_AVX2
-//#define HAS_I422TORGB24ROW_AVX2
+#define HAS_I422TORAWROW_AVX2
+#define HAS_I422TORGB24ROW_AVX2
 #define HAS_I422TORGBAROW_AVX2
 #define HAS_INTERPOLATEROW_AVX2
-//#define HAS_J422TOARGBROW_AVX2
-//#define HAS_J422TOABGRROW_AVX2
-//#define HAS_H422TOARGBROW_AVX2
-//#define HAS_H422TOABGRROW_AVX2
+#define HAS_J422TOARGBROW_AVX2
+#define HAS_J422TOABGRROW_AVX2
+#define HAS_H422TOARGBROW_AVX2
+#define HAS_H422TOABGRROW_AVX2
 #define HAS_MERGEUVROW_AVX2
 #define HAS_MIRRORROW_AVX2
 #define HAS_SPLITUVROW_AVX2
-//#define HAS_UYVYTOARGBROW_AVX2
+#define HAS_UYVYTOARGBROW_AVX2
 #define HAS_UYVYTOUV422ROW_AVX2
 #define HAS_UYVYTOUVROW_AVX2
 #define HAS_UYVYTOYROW_AVX2
-//#define HAS_YUY2TOARGBROW_AVX2
+#define HAS_YUY2TOARGBROW_AVX2
 #define HAS_YUY2TOUV422ROW_AVX2
 #define HAS_YUY2TOUVROW_AVX2
 #define HAS_YUY2TOYROW_AVX2

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1480
+#define LIBYUV_VERSION 1481
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

source/row_win.cc

@@ -2151,7 +2151,7 @@ void I422ToARGBMatrixRow_AVX2(const uint8* y_buf,
     mov        edi, [esp + 12 + 12]  // V
     mov        edx, [esp + 12 + 16]  // argb
     mov        ebp, [esp + 12 + 20]  // YuvConstants
-    mov        ecx, [esp + 12 + 20]  // width
+    mov        ecx, [esp + 12 + 24]  // width
     sub        edi, esi
     vpcmpeqb   ymm5, ymm5, ymm5     // generate 0xffffffffffffffff for alpha
 
@@ -2398,7 +2398,7 @@ void I422ToABGRMatrixRow_AVX2(const uint8* y_buf,
     mov        edi, [esp + 12 + 12]  // V
     mov        edx, [esp + 12 + 16]  // argb
     mov        ebp, [esp + 12 + 20]  // YuvConstants
-    mov        ecx, [esp + 12 + 20]  // width
+    mov        ecx, [esp + 12 + 24]  // width
     sub        edi, esi
     vpcmpeqb   ymm5, ymm5, ymm5     // generate 0xffffffffffffffff for alpha