Reorganize YUV scalers (Continued)

media/base/simd/convert_rgb_to_yuv_sse2.cc

 // Copyright (c) 2011 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/yuv_convert.h"
-#include "media/base/yuv_convert_internal.h"
-#include "media/base/yuv_row.h"
+#include "build/build_config.h"
+#include "media/base/simd/convert_rgb_to_yuv.h"
+#include "media/base/simd/yuv_to_rgb_table.h"
 
-#if defined(_MSC_VER)
+#if defined(COMPILER_MSVC)
 #include <intrin.h>
 #else
 #include <mmintrin.h>
 #include <emmintrin.h>
 #endif
 
 namespace media {
 
 #define FIX_SHIFT 12
 #define FIX(x) ((x) * (1 << FIX_SHIFT))
@@ skipping 58 matching lines @@
                                         const uint8* rgb_buf_2,
                                         uint8* y_buf_1,
                                         uint8* y_buf_2,
                                         uint8* u_buf,
                                         uint8* v_buf) {
   int sum_b = 0;
   int sum_g = 0;
   int sum_r = 0;
   int r, g, b;
 
+
+
   CONVERT_Y(rgb_buf_1, y_buf_1);
   CONVERT_Y(rgb_buf_1, y_buf_1);
   CONVERT_Y(rgb_buf_2, y_buf_2);
   CONVERT_Y(rgb_buf_2, y_buf_2);
   *u_buf++ = RGBToU(sum_r, sum_g, sum_b, 2);
   *v_buf++ = RGBToV(sum_r, sum_g, sum_b, 2);
 }
 
 static inline void ConvertRGBToYUV_V2H1(const uint8* rgb_buf_1,
                                         const uint8* rgb_buf_2,
@@ skipping 283 matching lines @@
     ++vplane;
     width -= 2;
   }
 
   // Handle the last pixel in the last row.
   if (width)
     ConvertRGBToYUV_V1H1(rgbframe, yplane, uplane, vplane);
 }
 
 }  // namespace media