libvpx: Pull from upstream

source/libvpx/vp8/common/x86/vp8_asm_stubs.c

 /*
  *  Copyright (c) 2010 The WebM 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 109 matching lines @@
 void vp8_sixtap_predict4x4_mmx
 (
     unsigned char  *src_ptr,
     int   src_pixels_per_line,
     int  xoffset,
     int  yoffset,
     unsigned char *dst_ptr,
     int dst_pitch
 )
 {
-    DECLARE_ALIGNED_ARRAY(16, unsigned short, FData2, 16*16);  /* Temp data bufffer used in filtering */
+    DECLARE_ALIGNED(16, unsigned short, FData2[16*16]);  /* Temp data bufffer used in filtering */
     const short *HFilter, *VFilter;
     HFilter = vp8_six_tap_mmx[xoffset];
     vp8_filter_block1d_h6_mmx(src_ptr - (2 * src_pixels_per_line), FData2, src_pixels_per_line, 1, 9, 8, HFilter);
     VFilter = vp8_six_tap_mmx[yoffset];
     vp8_filter_block1dc_v6_mmx(FData2 + 8, dst_ptr, dst_pitch, 8, 4 , 4, 4, VFilter);
 
 }
 
 
 void vp8_sixtap_predict16x16_mmx
 (
     unsigned char  *src_ptr,
     int   src_pixels_per_line,
     int  xoffset,
     int  yoffset,
     unsigned char *dst_ptr,
     int dst_pitch
 )
 {
 
-    DECLARE_ALIGNED_ARRAY(16, unsigned short, FData2, 24*24);  /* Temp data bufffer used in filtering */
+    DECLARE_ALIGNED(16, unsigned short, FData2[24*24]);  /* Temp data bufffer used in filtering */
 
     const short *HFilter, *VFilter;
 
 
     HFilter = vp8_six_tap_mmx[xoffset];
 
     vp8_filter_block1d_h6_mmx(src_ptr - (2 * src_pixels_per_line),    FData2,   src_pixels_per_line, 1, 21, 32, HFilter);
     vp8_filter_block1d_h6_mmx(src_ptr - (2 * src_pixels_per_line) + 4,  FData2 + 4, src_pixels_per_line, 1, 21, 32, HFilter);
     vp8_filter_block1d_h6_mmx(src_ptr - (2 * src_pixels_per_line) + 8,  FData2 + 8, src_pixels_per_line, 1, 21, 32, HFilter);
     vp8_filter_block1d_h6_mmx(src_ptr - (2 * src_pixels_per_line) + 12, FData2 + 12, src_pixels_per_line, 1, 21, 32, HFilter);
@@ skipping 11 matching lines @@
 (
     unsigned char  *src_ptr,
     int   src_pixels_per_line,
     int  xoffset,
     int  yoffset,
     unsigned char *dst_ptr,
     int dst_pitch
 )
 {
 
-    DECLARE_ALIGNED_ARRAY(16, unsigned short, FData2, 256);    /* Temp data bufffer used in filtering */
+    DECLARE_ALIGNED(16, unsigned short, FData2[256]);    /* Temp data bufffer used in filtering */
 
     const short *HFilter, *VFilter;
 
     HFilter = vp8_six_tap_mmx[xoffset];
     vp8_filter_block1d_h6_mmx(src_ptr - (2 * src_pixels_per_line),    FData2,   src_pixels_per_line, 1, 13, 16, HFilter);
     vp8_filter_block1d_h6_mmx(src_ptr - (2 * src_pixels_per_line) + 4,  FData2 + 4, src_pixels_per_line, 1, 13, 16, HFilter);
 
     VFilter = vp8_six_tap_mmx[yoffset];
     vp8_filter_block1dc_v6_mmx(FData2 + 16, dst_ptr,   dst_pitch, 16, 8 , 8, 8, VFilter);
     vp8_filter_block1dc_v6_mmx(FData2 + 20, dst_ptr + 4, dst_pitch, 16, 8 , 8, 8, VFilter);
 
 }
 
 
 void vp8_sixtap_predict8x4_mmx
 (
     unsigned char  *src_ptr,
     int   src_pixels_per_line,
     int  xoffset,
     int  yoffset,
     unsigned char *dst_ptr,
     int dst_pitch
 )
 {
 
-    DECLARE_ALIGNED_ARRAY(16, unsigned short, FData2, 256);    /* Temp data bufffer used in filtering */
+    DECLARE_ALIGNED(16, unsigned short, FData2[256]);    /* Temp data bufffer used in filtering */
 
     const short *HFilter, *VFilter;
 
     HFilter = vp8_six_tap_mmx[xoffset];
     vp8_filter_block1d_h6_mmx(src_ptr - (2 * src_pixels_per_line),    FData2,   src_pixels_per_line, 1, 9, 16, HFilter);
     vp8_filter_block1d_h6_mmx(src_ptr - (2 * src_pixels_per_line) + 4,  FData2 + 4, src_pixels_per_line, 1, 9, 16, HFilter);
 
     VFilter = vp8_six_tap_mmx[yoffset];
     vp8_filter_block1dc_v6_mmx(FData2 + 16, dst_ptr,   dst_pitch, 16, 8 , 4, 8, VFilter);
     vp8_filter_block1dc_v6_mmx(FData2 + 20, dst_ptr + 4, dst_pitch, 16, 8 , 4, 8, VFilter);
@@ skipping 25 matching lines @@
 (
     unsigned char  *src_ptr,
     int   src_pixels_per_line,
     int  xoffset,
     int  yoffset,
     unsigned char *dst_ptr,
     int dst_pitch
 
 )
 {
-    DECLARE_ALIGNED_ARRAY(16, unsigned short, FData2, 24*24);    /* Temp data bufffer used in filtering */
+    DECLARE_ALIGNED(16, unsigned short, FData2[24*24]);    /* Temp data bufffer used in filtering */
 
     const short *HFilter, *VFilter;
 
     if (xoffset)
     {
         if (yoffset)
         {
             HFilter = vp8_six_tap_mmx[xoffset];
             vp8_filter_block1d16_h6_sse2(src_ptr - (2 * src_pixels_per_line), FData2,   src_pixels_per_line, 1, 21, 32, HFilter);
             VFilter = vp8_six_tap_mmx[yoffset];
@@ skipping 19 matching lines @@
 void vp8_sixtap_predict8x8_sse2
 (
     unsigned char  *src_ptr,
     int   src_pixels_per_line,
     int  xoffset,
     int  yoffset,
     unsigned char *dst_ptr,
     int dst_pitch
 )
 {
-    DECLARE_ALIGNED_ARRAY(16, unsigned short, FData2, 256);  /* Temp data bufffer used in filtering */
+    DECLARE_ALIGNED(16, unsigned short, FData2[256]);  /* Temp data bufffer used in filtering */
     const short *HFilter, *VFilter;
 
     if (xoffset)
     {
         if (yoffset)
         {
             HFilter = vp8_six_tap_mmx[xoffset];
             vp8_filter_block1d8_h6_sse2(src_ptr - (2 * src_pixels_per_line), FData2,   src_pixels_per_line, 1, 13, 16, HFilter);
             VFilter = vp8_six_tap_mmx[yoffset];
             vp8_filter_block1d8_v6_sse2(FData2 + 16, dst_ptr,   dst_pitch, 16, 8 , 8, dst_pitch, VFilter);
@@ skipping 17 matching lines @@
 void vp8_sixtap_predict8x4_sse2
 (
     unsigned char  *src_ptr,
     int   src_pixels_per_line,
     int  xoffset,
     int  yoffset,
     unsigned char *dst_ptr,
     int dst_pitch
 )
 {
-    DECLARE_ALIGNED_ARRAY(16, unsigned short, FData2, 256);  /* Temp data bufffer used in filtering */
+    DECLARE_ALIGNED(16, unsigned short, FData2[256]);  /* Temp data bufffer used in filtering */
     const short *HFilter, *VFilter;
 
     if (xoffset)
     {
         if (yoffset)
         {
             HFilter = vp8_six_tap_mmx[xoffset];
             vp8_filter_block1d8_h6_sse2(src_ptr - (2 * src_pixels_per_line), FData2,   src_pixels_per_line, 1, 9, 16, HFilter);
             VFilter = vp8_six_tap_mmx[yoffset];
             vp8_filter_block1d8_v6_sse2(FData2 + 16, dst_ptr,   dst_pitch, 16, 8 , 4, dst_pitch, VFilter);
@@ skipping 81 matching lines @@
 (
     unsigned char  *src_ptr,
     int   src_pixels_per_line,
     int  xoffset,
     int  yoffset,
     unsigned char *dst_ptr,
     int dst_pitch
 
 )
 {
-    DECLARE_ALIGNED_ARRAY(16, unsigned char, FData2, 24*24);
+    DECLARE_ALIGNED(16, unsigned char, FData2[24*24]);
 
     if (xoffset)
     {
         if (yoffset)
         {
             vp8_filter_block1d16_h6_ssse3(src_ptr - (2 * src_pixels_per_line),
                                           src_pixels_per_line, FData2,
                                           16, 21, xoffset);
             vp8_filter_block1d16_v6_ssse3(FData2 , 16, dst_ptr, dst_pitch,
                                           16, yoffset);
@@ skipping 27 matching lines @@
 void vp8_sixtap_predict8x8_ssse3
 (
     unsigned char  *src_ptr,
     int   src_pixels_per_line,
     int  xoffset,
     int  yoffset,
     unsigned char *dst_ptr,
     int dst_pitch
 )
 {
-    DECLARE_ALIGNED_ARRAY(16, unsigned char, FData2, 256);
+    DECLARE_ALIGNED(16, unsigned char, FData2[256]);
 
     if (xoffset)
     {
         if (yoffset)
         {
             vp8_filter_block1d8_h6_ssse3(src_ptr - (2 * src_pixels_per_line),
                                          src_pixels_per_line, FData2,
                                          8, 13, xoffset);
             vp8_filter_block1d8_v6_ssse3(FData2, 8, dst_ptr, dst_pitch,
                                          8, yoffset);
@@ skipping 27 matching lines @@
 void vp8_sixtap_predict8x4_ssse3
 (
     unsigned char  *src_ptr,
     int   src_pixels_per_line,
     int  xoffset,
     int  yoffset,
     unsigned char *dst_ptr,
     int dst_pitch
 )
 {
-    DECLARE_ALIGNED_ARRAY(16, unsigned char, FData2, 256);
+    DECLARE_ALIGNED(16, unsigned char, FData2[256]);
 
     if (xoffset)
     {
         if (yoffset)
         {
             vp8_filter_block1d8_h6_ssse3(src_ptr - (2 * src_pixels_per_line),
                                          src_pixels_per_line, FData2,
                                          8, 9, xoffset);
             vp8_filter_block1d8_v6_ssse3(FData2, 8, dst_ptr, dst_pitch,
                                          4, yoffset);
@@ skipping 27 matching lines @@
 void vp8_sixtap_predict4x4_ssse3
 (
     unsigned char  *src_ptr,
     int   src_pixels_per_line,
     int  xoffset,
     int  yoffset,
     unsigned char *dst_ptr,
     int dst_pitch
 )
 {
-  DECLARE_ALIGNED_ARRAY(16, unsigned char, FData2, 4*9);
+  DECLARE_ALIGNED(16, unsigned char, FData2[4*9]);
 
   if (xoffset)
   {
       if (yoffset)
       {
           vp8_filter_block1d4_h6_ssse3(src_ptr - (2 * src_pixels_per_line),
                                        src_pixels_per_line,
                                        FData2, 4, 9, xoffset);
           vp8_filter_block1d4_v6_ssse3(FData2, 4, dst_ptr, dst_pitch,
                                        4, yoffset);
@@ skipping 26 matching lines @@
             dst_ptr[2]  = src_ptr[2];
             dst_ptr[3]  = src_ptr[3];
             dst_ptr     += dst_pitch;
             src_ptr     += src_pixels_per_line;
           }
       }
   }
 }
 
 #endif