Bug 1342732: Adjust ANY11P16 r=sotaro

MozReview-Commit-ID: ARnj1K5o2LM

media/libyuv/libyuv/source/row_any.cc

@@ -707,8 +707,8 @@ ANY11P(ARGBShuffleRow_Any_MSA, ARGBShuffleRow_MSA, const uint8*, 4, 4, 7)
 #define ANY11P16(NAMEANY, ANY_SIMD, T, SBPP, BPP, MASK)            \
   void NAMEANY(const uint16* src_ptr, uint16* dst_ptr, T shuffler, \
                int width) {                                        \
-    SIMD_ALIGNED(uint16 temp[32 * 2]);                             \
-    memset(temp, 0, 64); /* for msan */                            \
+    SIMD_ALIGNED(uint16 temp[64 * 2]);                             \
+    memset(temp, 0, 64*sizeof(uint16)); /* for msan */             \
     int r = width & MASK;                                          \
     int n = width & ~MASK;                                         \
     if (n > 0) {                                                   \

media/libyuv/row_any.patch

@@ -0,0 +1,24 @@
+diff --git a/media/libyuv/libyuv/source/row_any.cc b/media/libyuv/libyuv/source/row_any.cc
+--- a/media/libyuv/libyuv/source/row_any.cc
++++ b/media/libyuv/libyuv/source/row_any.cc
+@@ -702,18 +702,18 @@ ANY11P(ARGBShuffleRow_Any_NEON, ARGBShuf
+ ANY11P(ARGBShuffleRow_Any_MSA, ARGBShuffleRow_MSA, const uint8*, 4, 4, 7)
+ #endif
+ #undef ANY11P
+ 
+ // Any 1 to 1 with parameter and shorts.  BPP measures in shorts.
+ #define ANY11P16(NAMEANY, ANY_SIMD, T, SBPP, BPP, MASK)            \
+   void NAMEANY(const uint16* src_ptr, uint16* dst_ptr, T shuffler, \
+                int width) {                                        \
+-    SIMD_ALIGNED(uint16 temp[32 * 2]);                             \
+-    memset(temp, 0, 64); /* for msan */                            \
++    SIMD_ALIGNED(uint16 temp[64 * 2]);                             \
++    memset(temp, 0, 64*sizeof(uint16)); /* for msan */             \
+     int r = width & MASK;                                          \
+     int n = width & ~MASK;                                         \
+     if (n > 0) {                                                   \
+       ANY_SIMD(src_ptr, dst_ptr, shuffler, n);                     \
+     }                                                              \
+     memcpy(temp, src_ptr + n * SBPP, r * SBPP);                    \
+     ANY_SIMD(temp, temp + 64, shuffler, MASK + 1);                 \
+     memcpy(dst_ptr + n * BPP, temp + 64, r * BPP);                 \

media/libyuv/update.py

@@ -39,6 +39,10 @@ def apply_patches():
     os.system("patch -p3 < add_H444ToARGB.patch")
     # Patch for bug 1342730
     os.system("patch -p3 < cpu_id.patch")
+    # Patch for bug 1342730
+    os.system("patch -p3 < cpu_id.patch")
+    # Patch for bug 1342732
+    os.system("patch -p3 < row_any.patch")
 
 def update_readme(commit):
     with open('README_MOZILLA') as f: