Streamline SIMD targets in media.gyp

media/base/simd/convert_yuv_to_rgb_c.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/simd/convert_yuv_to_rgb.h"
 #include "media/base/simd/yuv_to_rgb_table.h"
 
+namespace media {
+
 #define packuswb(x) ((x) < 0 ? 0 : ((x) > 255 ? 255 : (x)))
 #define paddsw(x, y) (((x) + (y)) < -32768 ? -32768 : \
     (((x) + (y)) > 32767 ? 32767 : ((x) + (y))))
 
 static inline void ConvertYUVToRGB32_C(uint8 y,
                                        uint8 u,
                                        uint8 v,
                                        uint8* rgb_buf) {
   int b = kCoefficientsRgbY[256+u][0];
   int g = kCoefficientsRgbY[256+u][1];
@@ skipping 42 matching lines @@
   g >>= 6;
   r >>= 6;
 
   b = packuswb(b) * a >> 8;
   g = packuswb(g) * a >> 8;
   r = packuswb(r) * a >> 8;
 
   *reinterpret_cast<uint32*>(rgb_buf) = b | (g << 8) | (r << 16) | (a << 24);
 }
 
-extern "C" {

[Ami GONE FROM CHROMIUM, 2013/05/18 02:22:04]

Was this just not necessary or what?

[DaleCurtis, 2013/05/23 23:43:23]

Nope, I moved the _C functions outside of the extern blocks in the header file.

-
 void ConvertYUVToRGB32Row_C(const uint8* y_buf,
                             const uint8* u_buf,
                             const uint8* v_buf,
                             uint8* rgb_buf,
                             ptrdiff_t width) {
   for (int x = 0; x < width; x += 2) {
     uint8 u = u_buf[x >> 1];
     uint8 v = v_buf[x >> 1];
     uint8 y0 = y_buf[x];
     ConvertYUVToRGB32_C(y0, u, v, rgb_buf);
@@ skipping 92 matching lines @@
       y1 = y_buf[(x >> 16) + 1];
       y_frac = (x & 65535);
       y = (y_frac * y1 + (y_frac ^ 65535) * y0) >> 16;
       ConvertYUVToRGB32_C(y, u, v, rgb_buf+4);
       x += source_dx;
     }
     rgb_buf += 8;
   }
 }
 
-}
-
-namespace media {
-
 void ConvertYUVToRGB32_C(const uint8* yplane,
                          const uint8* uplane,
                          const uint8* vplane,
                          uint8* rgbframe,
                          int width,
                          int height,
                          int ystride,
                          int uvstride,
                          int rgbstride,
                          YUVType yuv_type) {
@@ skipping 35 matching lines @@
     ConvertYUVAToARGBRow_C(y_ptr,
                            u_ptr,
                            v_ptr,
                            a_ptr,
                            rgba_row,
                            width);
   }
 }
 
 }  // namespace media