Reorganize YUV scalers (Continued)

media/media.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the PulseAudio library.
     'use_pulseaudio%': 0,
   },
@@ skipping 335 matching lines @@
         }],
         [ 'target_arch == "arm"', {
           'dependencies': [
             'yuv_convert_simd_arm',
           ],
         }],
       ],
       'sources': [
         'base/yuv_convert.cc',
         'base/yuv_convert.h',
-        'base/yuv_convert_internal.h',
-        'base/yuv_convert_c.cc',
-        'base/yuv_row_win.cc',
-        'base/yuv_row_posix.cc',
-        'base/yuv_row_table.cc',
-        'base/yuv_row.h',
       ],
     },
     {
       'target_name': 'yuv_convert_simd_x86',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
-        'base/yuv_convert_sse2.cc',
-        'base/simd/convert_rgb_to_yuv_x86.cc',
+        'base/simd/convert_rgb_to_yuv_c.cc',
+        'base/simd/convert_rgb_to_yuv_sse2.cc',
         'base/simd/convert_rgb_to_yuv_ssse3.asm',
+        'base/simd/convert_rgb_to_yuv_ssse3.cc',
         'base/simd/convert_rgb_to_yuv_ssse3.inc',
         'base/simd/convert_yuv_to_rgb_c.cc',
         'base/simd/convert_yuv_to_rgb_x86.cc',
         'base/simd/convert_yuv_to_rgb_mmx.asm',
         'base/simd/convert_yuv_to_rgb_mmx.inc',
         'base/simd/convert_yuv_to_rgb_sse.asm',
         'base/simd/filter_yuv.h',
         'base/simd/filter_yuv_c.cc',
         'base/simd/filter_yuv_mmx.cc',
         'base/simd/filter_yuv_sse2.cc',
         'base/simd/linear_scale_yuv_to_rgb_mmx.asm',
         'base/simd/linear_scale_yuv_to_rgb_mmx.inc',
         'base/simd/linear_scale_yuv_to_rgb_sse.asm',
         'base/simd/scale_yuv_to_rgb_mmx.asm',
         'base/simd/scale_yuv_to_rgb_mmx.inc',
         'base/simd/scale_yuv_to_rgb_sse.asm',
+        'base/simd/yuv_to_rgb_table.cc',

[scherkus (not reviewing), 2011/09/16 00:18:58]

if the only two options are yuv_convert_simd_x86 or yuv_convert_simd_arm but
these files are present in both... any reason to keep them separated instead of
as common code?

I don't care either way -- up to you and what you find is more convenient :)

+        'base/simd/yuv_to_rgb_table.h',
       ],
       'conditions': [
         [ 'target_arch == "x64"', {
           # Source files optimized for X64 systems.
           'sources': [
             'base/simd/linear_scale_yuv_to_rgb_mmx_x64.asm',
             'base/simd/scale_yuv_to_rgb_sse2_x64.asm',
           ],
         }],
         [ 'os_posix == 1 and OS != "mac"', {
@@ skipping 70 matching lines @@
         '../third_party/yasm/yasm_compile.gypi',
       ],
     },
     {
       'target_name': 'yuv_convert_simd_arm',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
+        'base/simd/convert_rgb_to_yuv_c.cc',
+        'base/simd/convert_rgb_to_yuv.h',
         'base/simd/convert_yuv_to_rgb_c.cc',
+        'base/simd/convert_yuv_to_rgb.h',
         'base/simd/filter_yuv.h',
         'base/simd/filter_yuv_c.cc',
+        'base/simd/yuv_to_rgb_table.cc',
+        'base/simd/yuv_to_rgb_table.h',
       ],
     },
     {
       'target_name': 'ffmpeg_unittests',
       'type': 'executable',
       'dependencies': [
         'media',
         'media_test_support',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
@@ skipping 356 matching lines @@
             'tools/player_x11/gl_video_renderer.h',
             'tools/player_x11/player_x11.cc',
             'tools/player_x11/x11_video_renderer.cc',
             'tools/player_x11/x11_video_renderer.h',
           ],
         },
       ],
     }],
   ],
 }