Streamline SIMD targets in media.gyp

media/media.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
     # (DT_NEEDED) instead of using dlopen. This helps with automated
     # detection of ABI mismatches and prevents silent errors.
     'linux_link_pulseaudio%': 0,
     'conditions': [
-      ['OS == "android" or OS == "ios"', {
+      ['OS=="android" or OS=="ios"', {
         # Android and iOS don't use ffmpeg.
         'media_use_ffmpeg%': 0,
         # Android and iOS don't use libvpx.
         'media_use_libvpx%': 0,
-      }, {  # 'OS != "android" and OS != "ios"'
+      }, {  # 'OS!="android" and OS!="ios"'
         'media_use_ffmpeg%': 1,
         'media_use_libvpx%': 1,
       }],
       # Screen capturer works only on Windows, OSX and Linux (with X11).
       ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', {
         'screen_capture_supported%': 1,
       }, {
         'screen_capture_supported%': 0,
       }],
       # ALSA usage.
       ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
         'use_alsa%': 1,
       }, {
         'use_alsa%': 0,
       }],
-      ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and chromeos != 1', {
+      ['os_posix==1 and OS!="mac" and OS!="ios" and OS!="android" and chromeos!=1', {
         'use_pulseaudio%': 1,
       }, {
         'use_pulseaudio%': 0,
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'media',
       'type': '<(component)',
@@ skipping 227 matching lines @@
         'base/pipeline.h',
         'base/pipeline_status.cc',
         'base/pipeline_status.h',
         'base/ranges.cc',
         'base/ranges.h',
         'base/scoped_histogram_timer.h',
         'base/seekable_buffer.cc',
         'base/seekable_buffer.h',
         'base/serial_runner.cc',
         'base/serial_runner.h',
+        'base/simd/convert_rgb_to_yuv.h',
+        'base/simd/convert_rgb_to_yuv_c.cc',
+        'base/simd/convert_yuv_to_rgb.h',
+        'base/simd/convert_yuv_to_rgb_c.cc',
+        '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',
         'base/sinc_resampler.cc',
         'base/sinc_resampler.h',
         'base/stream_parser.cc',
         'base/stream_parser.h',
         'base/stream_parser_buffer.cc',
         'base/stream_parser_buffer.h',
         'base/video_decoder.cc',
         'base/video_decoder.h',
         'base/video_decoder_config.cc',
         'base/video_decoder_config.h',
         'base/video_frame.cc',
         'base/video_frame.h',
         'base/video_renderer.cc',
         'base/video_renderer.h',
         'base/video_util.cc',
         'base/video_util.h',
+        'base/yuv_convert.cc',
+        'base/yuv_convert.h',
         'crypto/aes_decryptor.cc',
         'crypto/aes_decryptor.h',
         'ffmpeg/ffmpeg_common.cc',
         'ffmpeg/ffmpeg_common.h',
         'filters/audio_decoder_selector.cc',
         'filters/audio_decoder_selector.h',
         'filters/audio_file_reader.cc',
         'filters/audio_file_reader.h',
         'filters/audio_renderer_algorithm.cc',
         'filters/audio_renderer_algorithm.h',
@@ skipping 133 matching lines @@
         'webm/webm_tracks_parser.h',
         'webm/webm_video_client.cc',
         'webm/webm_video_client.h',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'conditions': [
-        ['arm_neon == 1', {
+        ['arm_neon==1', {
           'defines': [
             'USE_NEON'
           ],
         }],
-        ['OS != "linux" or use_x11 == 1', {
+        ['OS!="linux" or use_x11==1', {
           'sources!': [
             'video/capture/screen/screen_capturer_null.cc',
           ]
         }],
-        ['OS != "ios"', {
+        ['OS!="ios"', {
           'dependencies': [
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             'shared_memory_support',

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

So does this now need a sources! of the yuv_convert files that previously were
only pulled in when !ios?

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

Nope, iOS excludes .* and then readds what it needs, so no changes necessary.

-            'yuv_convert',
           ],
         }],
-        ['media_use_ffmpeg == 1', {
+        ['media_use_ffmpeg==1', {
           'dependencies': [
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
-        }, {  # media_use_ffmpeg == 0
+        }, {  # media_use_ffmpeg==0
           # Exclude the sources that depend on ffmpeg.
           'sources!': [
             'base/media_posix.cc',
             'ffmpeg/ffmpeg_common.cc',
             'ffmpeg/ffmpeg_common.h',
             'filters/audio_file_reader.cc',
             'filters/audio_file_reader.h',
             'filters/blocking_url_protocol.cc',
             'filters/blocking_url_protocol.h',
             'filters/ffmpeg_audio_decoder.cc',
             'filters/ffmpeg_audio_decoder.h',
             'filters/ffmpeg_demuxer.cc',
             'filters/ffmpeg_demuxer.h',
             'filters/ffmpeg_glue.cc',
             'filters/ffmpeg_glue.h',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
             'filters/ffmpeg_video_decoder.cc',
             'filters/ffmpeg_video_decoder.h',
           ],
         }],
-        ['media_use_libvpx == 1', {
+        ['media_use_libvpx==1', {
           'dependencies': [
             '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
           ],
-        }, {  # media_use_libvpx == 0
+        }, {  # media_use_libvpx==0
           'direct_dependent_settings': {
             'defines': [
               'MEDIA_DISABLE_LIBVPX',
             ],
           },
           # Exclude the sources that depend on libvpx.
           'sources!': [
             'filters/vpx_video_decoder.cc',
             'filters/vpx_video_decoder.h',
           ],
         }],
-        ['OS == "ios"', {
+        ['OS=="ios"', {
           'includes': [
             # For shared_memory_support_sources variable.
             'shared_memory_support.gypi',
           ],
           'sources': [
             'base/media_stub.cc',
             # These sources are normally built via a dependency on the
             # shared_memory_support target, but that target is not built on iOS.
             # Instead, directly build only the files that are needed for iOS.
             '<@(shared_memory_support_sources)',
@@ skipping 21 matching lines @@
             ['include', '^base/vector_math\\.'],
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
               '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
             ],
           },
         }],
-        ['OS == "android"', {
+        ['OS=="android"', {
           'link_settings': {
             'libraries': [
               '-lOpenSLES',
             ],
           },
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/media',
           ],
           'dependencies': [
             'media_android_jni_headers',
             'player_android',
             'video_capture_android_jni_headers',
           ],
           'sources': [
             'base/media.cc',
             'base/media.h',
           ],
           'conditions': [
-            ['android_webview_build == 0', {
+            ['android_webview_build==0', {
               'dependencies': [
                 'media_java',
               ],
             }],
             ['use_openmax_dl_fft==1', {
               # FFT library requires Neon support, so we enable
               # WebAudio only if Neon is detected at runtime.
               'sources': [
                 'base/media_android.cc',
               ],
@@ skipping 20 matching lines @@
             'webm/chromeos/webm_encoder.h',
           ],
         }],
         ['use_alsa==1', {
           'link_settings': {
             'libraries': [
               '-lasound',
             ],
           },
         }, { # use_alsa==0
-          'sources/': [ ['exclude', '/alsa_' ],
-                      ['exclude', '/audio_manager_linux' ] ],
+          'sources/': [ ['exclude', '/alsa_'],
+                      ['exclude', '/audio_manager_linux'] ],
         }],
         ['OS!="openbsd"', {
           'sources!': [
             'audio/openbsd/audio_manager_openbsd.cc',
             'audio/openbsd/audio_manager_openbsd.h',
           ],
         }],
         ['OS=="linux"', {
           'variables': {
             'conditions': [
               ['sysroot!=""', {
                 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
               }, {
                 'pkg-config': 'pkg-config'
               }],
             ],
           },
           'conditions': [
-            ['use_x11 == 1', {
+            ['use_x11==1', {
               'link_settings': {
                 'libraries': [
                   '-lX11',
                   '-lXdamage',
                   '-lXext',
                   '-lXfixes',
                 ],
               },
             }],
-            ['use_cras == 1', {
+            ['use_cras==1', {
               'cflags': [
                 '<!@(<(pkg-config) --cflags libcras)',
               ],
               'link_settings': {
                 'libraries': [
                   '<!@(<(pkg-config) --libs libcras)',
                 ],
               },
               'defines': [
                 'USE_CRAS',
               ],
-            }, {  # else: use_cras == 0
+            }, {  # else: use_cras==0
               'sources!': [
                 'audio/cras/audio_manager_cras.cc',
                 'audio/cras/audio_manager_cras.h',
                 'audio/cras/cras_input.cc',
                 'audio/cras/cras_input.h',
                 'audio/cras/cras_unified.cc',
                 'audio/cras/cras_unified.h',
               ],
             }],
           ],
@@ skipping 54 matching lines @@
                              '-s', '<(stubs_filename_root)',
                              '-p', '<(project_path)',
                              '<@(_inputs)',
                   ],
                   'process_outputs_as_sources': 1,
                   'message': 'Generating Pulse stubs for dynamic loading.',
                 },
               ],
               'conditions': [
                 # Linux/Solaris need libdl for dlopen() and friends.
-                ['OS == "linux" or OS == "solaris"', {
+                ['OS=="linux" or OS=="solaris"', {
                   'link_settings': {
                     'libraries': [
                       '-ldl',
                     ],
                   },
                 }],
               ],
             }, {  # else: linux_link_pulseaudio==0
               'link_settings': {
                 'ldflags': [
@@ skipping 12 matching lines @@
             'audio/pulse/pulse_input.cc',
             'audio/pulse/pulse_input.h',
             'audio/pulse/pulse_output.cc',
             'audio/pulse/pulse_output.h',
             'audio/pulse/pulse_unified.cc',
             'audio/pulse/pulse_unified.h',
             'audio/pulse/pulse_util.cc',
             'audio/pulse/pulse_util.h',
           ],
         }],
-        ['os_posix == 1', {
+        ['os_posix==1', {
           'sources!': [
             'video/capture/video_capture_device_dummy.cc',
             'video/capture/video_capture_device_dummy.h',
           ],
         }],
         ['OS=="mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
               '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
@@ skipping 35 matching lines @@
                   'mf.dll',
                   'mfplat.dll',
                   'mfreadwrite.dll',
                 ],
               },
             },
           },
           # TODO(wolenetz): Fix size_t to int truncations in win64. See
           # http://crbug.com/171009
           'conditions': [
-            ['target_arch == "x64"', {
+            ['target_arch=="x64"', {
               'msvs_disabled_warnings': [ 4267, ],
             }],
           ],
         }],
         ['proprietary_codecs==1 or branding=="Chrome"', {
           'sources': [
             'mp4/aac.cc',
             'mp4/aac.h',
             'mp4/avc.cc',
             'mp4/avc.h',
             'mp4/box_definitions.cc',
             'mp4/box_definitions.h',
             'mp4/box_reader.cc',
             'mp4/box_reader.h',
             'mp4/cenc.cc',
             'mp4/cenc.h',
             'mp4/es_descriptor.cc',
             'mp4/es_descriptor.h',
             'mp4/mp4_stream_parser.cc',
             'mp4/mp4_stream_parser.h',
             'mp4/offset_byte_queue.cc',
             'mp4/offset_byte_queue.h',
             'mp4/track_run_iterator.cc',
             'mp4/track_run_iterator.h',
           ],
         }],
-        [ 'screen_capture_supported==1', {
+        ['screen_capture_supported==1', {
           'dependencies': [
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
           ],
         }, {
           'sources/': [
             ['exclude', '^video/capture/screen/'],
           ],
         }],
-        [ 'screen_capture_supported==1 and (target_arch=="ia32" or target_arch=="x64")', {
-          'dependencies': [
-            'differ_block_sse2',
-          ],
-        }],
         ['toolkit_uses_gtk==1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         }],
         # ios check is necessary due to http://crbug.com/172682.
-        ['OS != "ios" and (target_arch == "ia32" or target_arch == "x64")', {
+        ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', {
           'dependencies': [
+            'media_asm',
+            'media_mmx',
             'media_sse',
+            'media_sse2',
+          ],
+          'sources': [
+            'base/simd/convert_yuv_to_rgb_x86.cc',
           ],
         }],
-        ['google_tv == 1', {
+        ['google_tv==1', {
           'defines': [
             'ENABLE_EAC3_PLAYBACK',
           ],
         }],
       ],
       'target_conditions': [
-        ['OS == "ios"', {
+        ['OS=="ios"', {
           'sources/': [
             # Pull in specific Mac files for iOS (which have been filtered out
             # by file name rules).
             ['include', '^audio/mac/audio_input_mac\\.'],
           ],
         }],
       ],
     },
     {
       'target_name': 'media_unittests',
@@ skipping 107 matching lines @@
         'webm/cluster_builder.cc',
         'webm/cluster_builder.h',
         'webm/tracks_builder.cc',
         'webm/tracks_builder.h',
         'webm/webm_cluster_parser_unittest.cc',
         'webm/webm_content_encodings_client_unittest.cc',
         'webm/webm_parser_unittest.cc',
         'webm/webm_tracks_parser_unittest.cc',
       ],
       'conditions': [
-        ['arm_neon == 1', {
+        ['arm_neon==1', {
           'defines': [
             'USE_NEON'
           ],
         }],
-        ['OS != "ios"', {
+        ['OS!="ios"', {
           'dependencies': [
             'shared_memory_support',
-            'yuv_convert',
           ],
         }],
-        ['media_use_ffmpeg == 1', {
+        ['media_use_ffmpeg==1', {
           'dependencies': [
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
         }],
         ['os_posix==1 and OS!="mac" and OS!="ios"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
-        ['OS == "ios"', {
+        ['OS=="ios"', {
           'sources/': [
             ['exclude', '.*'],
             ['include', '^audio/audio_input_controller_unittest\\.cc$'],
             ['include', '^audio/audio_input_unittest\\.cc$'],
             ['include', '^audio/audio_parameters_unittest\\.cc$'],
             ['include', '^audio/ios/audio_manager_ios_unittest\\.cc$'],
             ['include', '^base/mock_reader\\.h$'],
             ['include', '^base/run_all_unittests\\.cc$'],
           ],
         }],
@@ skipping 10 matching lines @@
             'filters/ffmpeg_demuxer_unittest.cc',
             'filters/ffmpeg_glue_unittest.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
             'filters/ffmpeg_video_decoder_unittest.cc',
             'filters/pipeline_integration_test.cc',
             'filters/pipeline_integration_test_base.cc',
             'mp4/mp4_stream_parser_unittest.cc',
             'webm/webm_cluster_parser_unittest.cc',
           ],
           'conditions': [
-            ['gtest_target_type == "shared_library"', {
+            ['gtest_target_type=="shared_library"', {
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
                 'player_android',
               ],
             }],
           ],
         }],
-        ['OS == "linux"', {
+        ['OS=="linux"', {
           'conditions': [
-            ['use_cras == 1', {
+            ['use_cras==1', {
               'sources': [
                 'audio/cras/cras_input_unittest.cc',
                 'audio/cras/cras_unified_unittest.cc',
               ],
               'defines': [
                 'USE_CRAS',
               ],
             }],
           ],
         }],
         ['use_alsa==0', {
           'sources!': [
             'audio/linux/alsa_output_unittest.cc',
             'audio/audio_low_latency_input_output_unittest.cc',
           ],
         }],
-        ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', {
+        ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', {
           'sources': [
             'base/simd/convert_rgb_to_yuv_unittest.cc',
           ],
-          'dependencies': [
-            'media_sse',
-          ],
         }],
         ['screen_capture_supported==1', {
           'dependencies': [
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
           ],
         }, {
           'sources/': [
             ['exclude', '^video/capture/screen/'],
           ],
         }],
@@ skipping 40 matching lines @@
         'base/mock_demuxer_host.cc',
         'base/mock_demuxer_host.h',
         'base/mock_filters.cc',
         'base/mock_filters.h',
         'base/test_helpers.cc',
         'base/test_helpers.h',
         'video/capture/screen/screen_capturer_mock_objects.cc',
         'video/capture/screen/screen_capturer_mock_objects.h',
       ],
       'conditions': [
-        [ 'screen_capture_supported == 1', {
+        ['screen_capture_supported==1', {
           'dependencies': [
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
           ],
         }, {
           'sources/': [
             ['exclude', '^video/capture/screen/'],
           ],
         }],
       ],
     },
   ],
   'conditions': [
-    ['OS != "ios" and target_arch != "arm"', {
+    ['OS!="ios" and target_arch!="arm"', {
       'targets': [
-        {
-          'target_name': 'yuv_convert_simd_x86',
+       {
+          'target_name': 'media_asm',
           'type': 'static_library',
-          'include_dirs': [
-            '..',
-          ],
           'sources': [
-            '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_mmx.asm',
-            'base/simd/convert_yuv_to_rgb_mmx.inc',
             'base/simd/convert_yuv_to_rgb_sse.asm',
-            'base/simd/convert_yuv_to_rgb_x86.cc',
             'base/simd/convert_yuva_to_argb_mmx.asm',
-            'base/simd/convert_yuva_to_argb_mmx.inc',
             'base/simd/empty_register_state_mmx.asm',
-            'base/simd/filter_yuv.h',
-            'base/simd/filter_yuv_c.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',
-            'base/simd/yuv_to_rgb_table.h',
           ],
           'conditions': [
-            # TODO(jschuh): Get MMX enabled on Win64. crbug.com/179657
-            [ 'OS!="win" or target_arch=="ia32"', {
-              'sources': [
-                'base/simd/filter_yuv_mmx.cc',
-              ],
+            ['component=="shared_library"', {
+              'variables': {
+                'yasm_flags': ['-DEXPORT_SYMBOLS'],
+              },
             }],
-            [ 'target_arch == "x64"', {
+            ['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',
               ],
               'variables': {
-                'yasm_flags': [
-                  '-DARCH_X86_64',
-                ],
+                'yasm_flags': ['-DARCH_X86_64'],
               },
             }],
-            [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
-              'cflags': [
-                '-msse2',
-              ],
-            }],
-            [ 'OS == "mac"', {
-              'configurations': {
-                'Debug': {
-                  'xcode_settings': {

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

Where's this going?

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

Pinged the original author (dmaclach) and he said this is killable.  It was
originally added for the Chromoting plugin.  Everything should be built with
near ToT clang now AFAIK. 

-                    # gcc on the mac builds horribly unoptimized sse code in
-                    # debug mode. Since this is rarely going to be debugged,
-                    # run with full optimizations in Debug as well as Release.
-                    'GCC_OPTIMIZATION_LEVEL': '3',  # -O3
-                   },
-                 },
-              },
+            ['OS=="mac"', {
               'variables': {
                 'yasm_flags': [
                   '-DPREFIX',
                   '-DMACHO',
                 ],
               },
             }],
-            [ 'os_posix==1 and OS!="mac"', {
+            ['os_posix==1 and OS!="mac"', {
               'variables': {
                 'conditions': [
-                  [ 'target_arch=="ia32"', {
+                  ['target_arch=="ia32"', {
                     'yasm_flags': [
                       '-DX86_32',
                       '-DELF',
                     ],
                   }, {
                     'yasm_flags': [
                       '-DELF',
                       '-DPIC',
                     ],
                   }],
                 ],
               },
             }],
           ],
           'variables': {
             'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/media',
             'yasm_flags': [
               '-DCHROMIUM',
               # In addition to the same path as source asm, let yasm %include
               # search path be relative to src/ per Chromium policy.
               '-I..',
             ],
+            'yasm_includes': [
+              'base/simd/convert_rgb_to_yuv_ssse3.inc',
+              'base/simd/convert_yuv_to_rgb_mmx.inc',
+              'base/simd/convert_yuva_to_argb_mmx.inc',
+              'base/simd/linear_scale_yuv_to_rgb_mmx.inc',
+              'base/simd/scale_yuv_to_rgb_mmx.inc',
+            ],
           },
           'msvs_2010_disable_uldi_when_referenced': 1,
           'includes': [
             '../third_party/yasm/yasm_compile.gypi',
           ],
         },
+        {
+          'target_name': 'media_mmx',
+          'type': 'static_library',
+          'cflags': [
+            '-mmmx',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'defines': [
+            'MEDIA_IMPLEMENTATION',
+          ],
+          'conditions': [
+            # TODO(jschuh): Get MMX enabled on Win64. crbug.com/179657
+            ['OS!="win" or target_arch=="ia32"', {
+              'sources': [
+                'base/simd/filter_yuv_mmx.cc',
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'media_sse',
+          'type': 'static_library',
+          'cflags': [
+            '-msse',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'defines': [
+            'MEDIA_IMPLEMENTATION',
+          ],
+          'sources': [
+            'base/simd/sinc_resampler_sse.cc',
+          ],
+        },
+        {
+          'target_name': 'media_sse2',
+          'type': 'static_library',
+          'cflags': [
+            '-msse2',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'defines': [
+            'MEDIA_IMPLEMENTATION',
+          ],
+          'sources': [
+            'base/simd/convert_rgb_to_yuv_sse2.cc',
+            'base/simd/convert_rgb_to_yuv_ssse3.cc',
+            'base/simd/filter_yuv_sse2.cc',
+            'video/capture/screen/differ_block_sse2.cc',
+            'video/capture/screen/differ_block_sse2.h',
+          ],
+        },
+        {
+          'target_name': 'shared_memory_support_sse',
+          'type': 'static_library',
+          'cflags': [
+            '-msse',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'defines': [
+            'MEDIA_IMPLEMENTATION',
+          ],
+          'sources': [
+            'base/simd/vector_math_sse.cc',
+          ],
+        },
       ], # targets
     }],
-    ['OS != "ios"', {
+    ['OS!="ios"', {
       'targets': [
         {
           # Minimal target for NaCl and other renderer side media clients which
           # only need to send audio data across the shared memory to the browser
           # process.
           'target_name': 'shared_memory_support',
           'type': '<(component)',
           'dependencies': [
             '../base/base.gyp:base',
           ],
           'defines': [
             'MEDIA_IMPLEMENTATION',
           ],
           'include_dirs': [
             '..',
           ],
           'includes': [
             'shared_memory_support.gypi',
           ],
           'sources': [
             '<@(shared_memory_support_sources)',
           ],
           'conditions': [
-            [ 'target_arch == "ia32" or target_arch == "x64"', {
-              'dependencies': [
-                'media_sse',
+            ['arm_neon==1', {
+              'defines': [
+                'USE_NEON'
               ],
             }],
-            ['arm_neon == 1', {
-              'defines': [
-                'USE_NEON'
+            ['target_arch=="ia32" or target_arch=="x64"', {
+              'dependencies': [
+                'shared_memory_support_sse'
               ],
             }],
           ],
         },
         {
-          'target_name': 'yuv_convert',
-          'type': 'static_library',
-          'include_dirs': [
-            '..',
-          ],
-          'conditions': [
-            [ 'target_arch == "ia32" or target_arch == "x64"', {
-              'dependencies': [
-                'yuv_convert_simd_x86',
-              ],
-            }],
-            [ 'target_arch == "arm" or target_arch == "mipsel"', {
-              'dependencies': [
-                'yuv_convert_simd_c',
-              ],
-            }],
-          ],
-          'sources': [
-            'base/yuv_convert.cc',
-            'base/yuv_convert.h',
-          ],
-        },
-        {
-          'target_name': 'yuv_convert_simd_c',
-          'type': 'static_library',
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'base/simd/convert_rgb_to_yuv.h',
-            'base/simd/convert_rgb_to_yuv_c.cc',
-            'base/simd/convert_yuv_to_rgb.h',
-            'base/simd/convert_yuv_to_rgb_c.cc',
-            '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': 'seek_tester',
           'type': 'executable',
           'dependencies': [
             'media',
             '../base/base.gyp:base',
           ],
           'sources': [
             'tools/seek_tester/seek_tester.cc',
           ],
         },
         {
           'target_name': 'demuxer_bench',
           'type': 'executable',
           'dependencies': [
             'media',
             '../base/base.gyp:base',
           ],
           'sources': [
             'tools/demuxer_bench/demuxer_bench.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
       ],
     }],
-    ['(OS == "win" or toolkit_uses_gtk == 1) and use_aura != 1', {
+    ['(OS=="win" or toolkit_uses_gtk==1) and use_aura!=1', {
       'targets': [
         {
           'target_name': 'shader_bench',
           'type': 'executable',
           'dependencies': [
             'media',
-            'yuv_convert',
             '../base/base.gyp:base',
             '../ui/gl/gl.gyp:gl',
             '../ui/ui.gyp:ui',
           ],
           'sources': [
             'tools/shader_bench/cpu_color_painter.cc',
             'tools/shader_bench/cpu_color_painter.h',
             'tools/shader_bench/gpu_color_painter.cc',
             'tools/shader_bench/gpu_color_painter.h',
             'tools/shader_bench/gpu_painter.cc',
             'tools/shader_bench/gpu_painter.h',
             'tools/shader_bench/painter.cc',
             'tools/shader_bench/painter.h',
             'tools/shader_bench/shader_bench.cc',
             'tools/shader_bench/window.cc',
             'tools/shader_bench/window.h',
           ],
           'conditions': [
-            ['toolkit_uses_gtk == 1', {
+            ['toolkit_uses_gtk==1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
               ],
               'sources': [
                 'tools/shader_bench/window_linux.cc',
               ],
             }],
             ['OS=="win"', {
               'dependencies': [
                 '../third_party/angle/src/build_angle.gyp:libEGL',
                 '../third_party/angle/src/build_angle.gyp:libGLESv2',
               ],
               'sources': [
                 'tools/shader_bench/window_win.cc',
               ],
             }],
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
       ],
     }],
-    ['use_x11 == 1', {
+    ['use_x11==1', {
       'targets': [
         {
           'target_name': 'player_x11',
           'type': 'executable',
           'dependencies': [
             'media',
-            'yuv_convert',
             '../base/base.gyp:base',
             '../ui/gl/gl.gyp:gl',
             '../ui/ui.gyp:ui',
           ],
           'link_settings': {
             'libraries': [
               '-ldl',
               '-lX11',
               '-lXrender',
               '-lXext',
             ],
           },
           'sources': [
             'tools/player_x11/data_source_logger.cc',
             'tools/player_x11/data_source_logger.h',
             'tools/player_x11/gl_video_renderer.cc',
             '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',
           ],
         },
       ],
     }],
     # Special target to wrap a gtest_target_type==shared_library
     # media_unittests into an android apk for execution.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS=="android" and gtest_target_type=="shared_library"', {
       'targets': [
         {
           'target_name': 'media_unittests_apk',
           'type': 'none',
           'dependencies': [
             'media_java',
             'media_unittests',
           ],
           'variables': {
             'test_suite_name': 'media_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)media_unittests<(SHARED_LIB_SUFFIX)',
           },
-          'includes': [ '../build/apk_test.gypi' ],
+          'includes': ['../build/apk_test.gypi'],
         },
       ],
     }],
-    ['OS == "android"', {
+    ['OS=="android"', {
       'targets': [
         {
           'target_name': 'media_player_jni_headers',
           'type': 'none',
           'variables': {
             'jni_gen_package': 'media',
             'input_java_class': 'android/media/MediaPlayer.class',
           },
-          'includes': [ '../build/jar_file_jni_generator.gypi' ],
+          'includes': ['../build/jar_file_jni_generator.gypi'],
         },
         {
           'target_name': 'media_android_jni_headers',
           'type': 'none',
           'dependencies': [
             'media_player_jni_headers',
           ],
           'sources': [
             'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',
             'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
             'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
             'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java',
           ],
           'variables': {
             'jni_gen_package': 'media',
           },
-          'includes': [ '../build/jni_generator.gypi' ],
+          'includes': ['../build/jni_generator.gypi'],
         },
         {
           'target_name': 'video_capture_android_jni_headers',
           'type': 'none',
           'sources': [
             'base/android/java/src/org/chromium/media/VideoCapture.java',
           ],
           'variables': {
             'jni_gen_package': 'media',
           },
-          'includes': [ '../build/jni_generator.gypi' ],
+          'includes': ['../build/jni_generator.gypi'],
         },
         {
           'target_name': 'media_codec_jni_headers',
           'type': 'none',
           'variables': {
             'jni_gen_package': 'media',
             'input_java_class': 'android/media/MediaCodec.class',
           },
-          'includes': [ '../build/jar_file_jni_generator.gypi' ],
+          'includes': ['../build/jar_file_jni_generator.gypi'],
         },
         {
           'target_name': 'media_format_jni_headers',
           'type': 'none',
           'variables': {
             'jni_gen_package': 'media',
             'input_java_class': 'android/media/MediaFormat.class',
           },
-          'includes': [ '../build/jar_file_jni_generator.gypi' ],
+          'includes': ['../build/jar_file_jni_generator.gypi'],
         },
         {
           'target_name': 'player_android',
           'type': 'static_library',
           'sources': [
             'base/android/media_codec_bridge.cc',
             'base/android/media_codec_bridge.h',
             'base/android/media_jni_registrar.cc',
             'base/android/media_jni_registrar.h',
             'base/android/media_player_android.cc',
             'base/android/media_player_android.h',
             'base/android/media_player_bridge.cc',
             'base/android/media_player_bridge.h',
             'base/android/media_player_listener.cc',
             'base/android/media_player_listener.h',
             'base/android/webaudio_media_codec_bridge.cc',
             'base/android/webaudio_media_codec_bridge.h',
             'base/android/webaudio_media_codec_info.h',
           ],
           'conditions': [
-            ['google_tv == 1', {
+            ['google_tv==1', {
               'sources': [
                 'base/android/demuxer_stream_player_params.cc',
                 'base/android/demuxer_stream_player_params.h',
               ],
             }],
           ],
           'dependencies': [
             '../base/base.gyp:base',
             'media_android_jni_headers',
             'media_codec_jni_headers',
             'media_format_jni_headers',
           ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/media',
           ],
         },
         {
           'target_name': 'media_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
           ],
           'export_dependent_settings': [
             '../base/base.gyp:base',
           ],
           'variables': {
             'java_in_dir': 'base/android/java',
           },
-          'includes': [ '../build/java.gypi' ],
+          'includes': ['../build/java.gypi'],
         },
 
       ],
     }],
-    ['media_use_ffmpeg == 1', {
+    ['media_use_ffmpeg==1', {
       'targets': [
         {
           'target_name': 'ffmpeg_unittests',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../base/base.gyp:test_support_base',
             '../base/base.gyp:test_support_perf',
             '../testing/gtest.gyp:gtest',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
             'media',
             'media_test_support',
           ],
           'sources': [
             'ffmpeg/ffmpeg_unittest.cc',
           ],
           'conditions': [
-            ['toolkit_uses_gtk == 1', {
+            ['toolkit_uses_gtk==1', {
               'dependencies': [
                 # Needed for the following #include chain:
                 #   base/run_all_unittests.cc
                 #   ../base/test_suite.h
                 #   gtk/gtk.h
                 '../build/linux/system.gyp:gtk',
               ],
               'conditions': [
                 ['linux_use_tcmalloc==1', {
                   'dependencies': [
@@ skipping 56 matching lines @@
             'media',
           ],
           'sources': [
             'tools/media_bench/media_bench.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
       ],
     }],
-    [ 'screen_capture_supported==1 and (target_arch=="ia32" or target_arch=="x64")', {
-      'targets': [
-        {
-          'target_name': 'differ_block_sse2',
-          'type': 'static_library',
-          'conditions': [
-            [ 'os_posix == 1 and OS != "mac"', {
-              'cflags': [
-                '-msse2',
-              ],
-            }],
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'video/capture/screen/differ_block_sse2.cc',
-            'video/capture/screen/differ_block_sse2.h',
-          ],
-        }, # end of target differ_block_sse2
-      ],
-    }],
-    # ios check is necessary due to http://crbug.com/172682.
-    ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', {
-      'targets': [
-        {
-          'target_name': 'media_sse',
-          'type': 'static_library',
-          'cflags': [
-            '-msse',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'defines': [
-            'MEDIA_IMPLEMENTATION',
-          ],
-          'sources': [
-            'base/simd/sinc_resampler_sse.cc',
-            'base/simd/vector_math_sse.cc',
-          ],
-        }, # end of target media_sse
-      ],
-    }],
   ],
 }