Move screen capturers to remoting/capturer.

remoting/remoting.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': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
 
@@ skipping 228 matching lines @@
           'REMOTING_MULTI_PROCESS',
         ],
       }],
     ],
   },
 
   'conditions': [
     ['enable_remoting_host==1', {
       'targets': [
         {
-          'target_name': 'differ_block',
+          'target_name': 'remoting_screen_capturer',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            '../skia/skia.gyp:skia',
+          ],
+          'sources': [
+            'capturer/capture_data.cc',
+            'capturer/capture_data.h',
+            'capturer/shared_buffer.cc',
+            'capturer/shared_buffer.h',
+            'capturer/shared_buffer_factory.h',
+            'capturer/differ.cc',
+            'capturer/differ.h',
+            'capturer/differ_block.cc',
+            'capturer/differ_block.h',
+            'capturer/linux/x_server_pixel_buffer.cc',
+            'capturer/linux/x_server_pixel_buffer.h',
+            'capturer/mac/scoped_pixel_buffer_object.cc',
+            'capturer/mac/scoped_pixel_buffer_object.h',
+            'capturer/mouse_cursor_shape.cc',
+            'capturer/mouse_cursor_shape.h',
+            'capturer/video_frame.cc',
+            'capturer/video_frame.h',
+            'capturer/video_frame_capturer.h',
+            'capturer/video_frame_capturer_fake.cc',
+            'capturer/video_frame_capturer_fake.h',
+            'capturer/video_frame_capturer_helper.cc',
+            'capturer/video_frame_capturer_helper.h',
+            'capturer/video_frame_capturer_linux.cc',
+            'capturer/video_frame_capturer_mac.mm',
+            'capturer/video_frame_capturer_win.cc',
+            'capturer/video_frame_queue.cc',
+            'capturer/video_frame_queue.h',
+            'capturer/win/desktop.cc',
+            'capturer/win/desktop.h',
+            'capturer/win/scoped_thread_desktop.cc',
+            'capturer/win/scoped_thread_desktop.h',
+          ],
           'conditions': [
             [ 'target_arch == "ia32" or target_arch == "x64"', {
               'dependencies': [
                 'differ_block_sse2',
               ],
             }],
+            ['toolkit_uses_gtk==1', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
+            }, {  # else toolkit_uses_gtk!=1
+              'sources!': [
+                '*_gtk.cc',
+              ],
+            }],
           ],
-          'sources': [
-            'host/differ_block.cc',
-            'host/differ_block.h',
-          ],
-        }, # end of target differ_block
+        }, # end of target remoting_screen_capturer
 
         {
           'target_name': 'remoting_host',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             'remoting_base',
             'remoting_jingle_glue',
             'remoting_protocol',
-            'differ_block',
+            'remoting_screen_capturer',
             '../crypto/crypto.gyp:crypto',
             '../google_apis/google_apis.gyp:google_apis',
             '../ipc/ipc.gyp:ipc',
           ],
           'defines': [
             'VERSION=<(version_full)',
           ],
           'sources': [
             'host/audio_capturer.cc',
             'host/audio_capturer.h',
@@ skipping 28 matching lines @@
             'host/desktop_environment.h',
             'host/desktop_environment_factory.cc',
             'host/desktop_environment_factory.h',
             'host/desktop_resizer.h',
             'host/desktop_resizer_linux.cc',
             'host/desktop_resizer_win.cc',
             'host/desktop_resizer_mac.cc',
             'host/desktop_session_connector.h',
             'host/desktop_session_proxy.cc',
             'host/desktop_session_proxy.h',
-            'host/differ.cc',
-            'host/differ.h',
             'host/disconnect_window.h',
             'host/disconnect_window_gtk.cc',
             'host/disconnect_window_mac.h',
             'host/disconnect_window_mac.mm',
             'host/disconnect_window_win.cc',
             'host/dns_blackhole_checker.cc',
             'host/dns_blackhole_checker.h',
             'host/event_executor.h',
             'host/event_executor_fake.cc',
             'host/event_executor_fake.h',
@@ skipping 29 matching lines @@
             'host/it2me_host_user_interface.cc',
             'host/it2me_host_user_interface.h',
             'host/json_host_config.cc',
             'host/json_host_config.h',
             'host/linux/audio_pipe_reader.cc',
             'host/linux/audio_pipe_reader.h',
             'host/linux/x11_util.cc',
             'host/linux/x11_util.h',
             'host/linux/x_server_clipboard.cc',
             'host/linux/x_server_clipboard.h',
-            'host/linux/x_server_pixel_buffer.cc',
-            'host/linux/x_server_pixel_buffer.h',
             'host/local_input_monitor.h',
             'host/local_input_monitor_linux.cc',
             'host/local_input_monitor_mac.mm',
             'host/local_input_monitor_thread_linux.cc',
             'host/local_input_monitor_thread_linux.h',
             'host/local_input_monitor_win.cc',
             'host/log_to_server.cc',
             'host/log_to_server.h',
-            'host/mac/scoped_pixel_buffer_object.cc',
-            'host/mac/scoped_pixel_buffer_object.h',
             'host/mouse_clamping_filter.cc',
             'host/mouse_clamping_filter.h',
             'host/mouse_move_observer.h',
             'host/network_settings.h',
             'host/pam_authorization_factory_posix.cc',
             'host/pam_authorization_factory_posix.h',
             'host/pin_hash.cc',
             'host/pin_hash.h',
             'host/policy_hack/policy_watcher.h',
             'host/policy_hack/policy_watcher.cc',
@@ skipping 16 matching lines @@
             'host/session_manager_factory.h',
             'host/signaling_connector.cc',
             'host/signaling_connector.h',
             'host/ui_strings.cc',
             'host/ui_strings.h',
             'host/url_request_context.cc',
             'host/url_request_context.h',
             'host/usage_stats_consent.h',
             'host/usage_stats_consent_mac.cc',
             'host/usage_stats_consent_win.cc',
-            'host/video_frame.cc',
-            'host/video_frame.h',
-            'host/video_frame_capturer.h',
-            'host/video_frame_capturer_fake.cc',
-            'host/video_frame_capturer_fake.h',
-            'host/video_frame_capturer_helper.cc',
-            'host/video_frame_capturer_helper.h',
-            'host/video_frame_capturer_linux.cc',
-            'host/video_frame_capturer_mac.mm',
-            'host/video_frame_capturer_win.cc',
-            'host/video_frame_queue.cc',
-            'host/video_frame_queue.h',
             'host/video_scheduler.cc',
             'host/video_scheduler.h',
             'host/vlog_net_log.cc',
             'host/vlog_net_log.h',
-            'host/win/desktop.cc',
-            'host/win/desktop.h',
             'host/win/launch_process_with_token.cc',
             'host/win/launch_process_with_token.h',
             'host/win/omaha.cc',
             'host/win/omaha.h',
-            'host/win/scoped_thread_desktop.cc',
-            'host/win/scoped_thread_desktop.h',
             'host/win/security_descriptor.cc',
             'host/win/security_descriptor.h',
             'host/win/session_desktop_environment_factory.cc',
             'host/win/session_desktop_environment_factory.h',
             'host/win/session_event_executor.cc',
             'host/win/session_event_executor.h',
             'host/win/window_station_and_desktop.cc',
             'host/win/window_station_and_desktop.h',
           ],
           'conditions': [
@@ skipping 802 matching lines @@
             '../net/net.gyp:net',
             'remoting_base',
             'remoting_breakpad',
             'remoting_host',
             'remoting_host_logging',
             'remoting_version_resources',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_version.rc',
             'base/scoped_sc_handle_win.h',
+            'capturer/win/desktop.cc',
+            'capturer/win/desktop.h',
+            'capturer/win/scoped_thread_desktop.cc',
+            'capturer/win/scoped_thread_desktop.h',
             'host/chromoting_messages.cc',
             'host/chromoting_messages.h',
             'host/config_file_watcher.cc',
             'host/config_file_watcher.h',
             'host/daemon_process.cc',
             'host/daemon_process.h',
             'host/daemon_process_win.cc',
             'host/desktop_session.cc',
             'host/desktop_session.h',
             'host/desktop_session_win.cc',
             'host/desktop_session_win.h',
             'host/host_exit_codes.h',
             'host/ipc_constants.cc',
             'host/ipc_constants.h',
             'host/sas_injector.h',
             'host/sas_injector_win.cc',
-            'host/win/desktop.cc',
-            'host/win/desktop.h',
             'host/win/host_service.cc',
             'host/win/host_service.h',
             'host/win/host_service.rc',
             'host/win/host_service_resource.h',
             'host/win/omaha.cc',
             'host/win/omaha.h',
-            'host/win/scoped_thread_desktop.cc',
-            'host/win/scoped_thread_desktop.h',
             'host/win/unprivileged_process_delegate.cc',
             'host/win/unprivileged_process_delegate.h',
             'host/win/worker_process_launcher.cc',
             'host/win/worker_process_launcher.h',
             'host/win/wts_console_monitor.h',
             'host/win/wts_console_observer.h',
             'host/win/wts_console_session_process_driver.cc',
             'host/win/wts_console_session_process_driver.h',
             'host/win/wts_session_process_delegate.cc',
             'host/win/wts_session_process_delegate.h',
@@ skipping 566 matching lines @@
       # This target needs a hard dependency because dependent targets
       # depend on chromotocol_proto_lib for headers.
       'hard_dependency': 1,
       'sources': [
         'base/auto_thread.cc',
         'base/auto_thread.h',
         'base/auto_thread_task_runner.cc',
         'base/auto_thread_task_runner.h',
         'base/auth_token_util.cc',
         'base/auth_token_util.h',
-        'base/capture_data.cc',
-        'base/capture_data.h',
         'base/compound_buffer.cc',
         'base/compound_buffer.h',
         'base/constants.cc',
         'base/constants.h',
         'base/plugin_thread_task_runner.cc',
         'base/plugin_thread_task_runner.h',
         'base/rate_counter.cc',
         'base/rate_counter.h',
         'base/resources.cc',
         'base/resources.h',
         'base/running_average.cc',
         'base/running_average.h',
-        'base/shared_buffer.cc',
-        'base/shared_buffer.h',
-        'base/shared_buffer_factory.h',
         'base/socket_reader.cc',
         'base/socket_reader.h',
         'base/stoppable.cc',
         'base/stoppable.h',
         'base/typed_buffer.h',
         'base/util.cc',
         'base/util.h',
         'codec/audio_decoder.cc',
         'codec/audio_decoder.h',
         'codec/audio_decoder_opus.cc',
@@ skipping 216 matching lines @@
       'target_name': 'differ_block_sse2',
       'type': 'static_library',
       'conditions': [
         [ 'os_posix == 1 and OS != "mac"', {
           'cflags': [
             '-msse2',
           ],
         }],
       ],
       'sources': [
-        'host/differ_block_sse2.cc',
+        'capturer/differ_block_sse2.cc',
+        'capturer/differ_block_sse2.h',
       ],
     }, # end of target differ_block_sse2
 
     # Remoting unit tests
     {
       'target_name': 'remoting_unittests',
       'type': 'executable',
       'dependencies': [
         'remoting_base',
         'remoting_resources',
@@ skipping 16 matching lines @@
       ],
       'defines': [
         'VERSION=<(version_full)',
       ],
       'include_dirs': [
         '../testing/gmock/include',
       ],
       'sources': [
         '../chrome/test/base/run_all_remoting_unittests.cc',
         'base/auth_token_util_unittest.cc',
+        'base/auto_thread_task_runner_unittest.cc',
         'base/auto_thread_unittest.cc',
-        'base/auto_thread_task_runner_unittest.cc',
         'base/breakpad_win_unittest.cc',
         'base/compound_buffer_unittest.cc',
         'base/resources_unittest.cc',
-        'base/shared_buffer_unittest.cc',
         'base/typed_buffer_unittest.cc',
         'base/util_unittest.cc',
+        'capturer/video_capturer_mock_objects.cc',
+        'capturer/video_capturer_mock_objects.h',
+        'capturer/differ_block_unittest.cc',
+        'capturer/differ_unittest.cc',
+        'capturer/shared_buffer_unittest.cc',
+        'capturer/video_frame_capturer_helper_unittest.cc',
+        'capturer/video_frame_capturer_mac_unittest.cc',
+        'capturer/video_frame_capturer_unittest.cc',
         'client/audio_player_unittest.cc',
         'client/key_event_mapper_unittest.cc',
         'client/plugin/mac_key_event_processor_unittest.cc',
         'codec/audio_encoder_opus_unittest.cc',
         'codec/codec_test.cc',
         'codec/codec_test.h',
         'codec/video_decoder_vp8_unittest.cc',
         'codec/video_encoder_verbatim_unittest.cc',
         'codec/video_encoder_vp8_unittest.cc',
         'host/audio_capturer_win_unittest.cc',
         'host/branding.cc',
         'host/branding.h',
         'host/chromoting_host_context_unittest.cc',
         'host/chromoting_host_unittest.cc',
         'host/client_session_unittest.cc',
         'host/config_file_watcher.cc',
         'host/config_file_watcher.h',
         'host/daemon_process.cc',
         'host/daemon_process.h',
         'host/daemon_process_unittest.cc',
         'host/desktop_process.cc',
         'host/desktop_process.h',
         'host/desktop_process_unittest.cc',
         'host/desktop_session.cc',
         'host/desktop_session.h',
         'host/desktop_session_agent.cc',
         'host/desktop_session_agent.h',
         'host/desktop_session_agent_posix.cc',
         'host/desktop_session_agent_win.cc',
-        'host/differ_block_unittest.cc',
-        'host/differ_unittest.cc',
         'host/heartbeat_sender_unittest.cc',
         'host/host_key_pair_unittest.cc',
         'host/host_mock_objects.cc',
         'host/host_mock_objects.h',
         'host/json_host_config_unittest.cc',
         'host/linux/x_server_clipboard_unittest.cc',
         'host/local_input_monitor_unittest.cc',
         'host/log_to_server_unittest.cc',
         'host/pin_hash_unittest.cc',
         'host/policy_hack/fake_policy_watcher.cc',
         'host/policy_hack/fake_policy_watcher.h',
         'host/policy_hack/mock_policy_callback.cc',
         'host/policy_hack/mock_policy_callback.h',
         'host/policy_hack/policy_watcher_unittest.cc',
         'host/register_support_host_request_unittest.cc',
         'host/remote_input_filter_unittest.cc',
         'host/resizing_host_observer_unittest.cc',
         'host/server_log_entry_unittest.cc',
         'host/setup/oauth_helper_unittest.cc',
         'host/setup/pin_validator_unittest.cc',
         'host/test_key_pair.h',
-        'host/video_frame_capturer_helper_unittest.cc',
-        'host/video_frame_capturer_mac_unittest.cc',
-        'host/video_frame_capturer_unittest.cc',
         'host/video_scheduler_unittest.cc',
         'host/win/worker_process_launcher.cc',
         'host/win/worker_process_launcher.h',
         'host/win/worker_process_launcher_unittest.cc',
         'jingle_glue/chromium_socket_factory_unittest.cc',
         'jingle_glue/fake_signal_strategy.cc',
         'jingle_glue/fake_signal_strategy.h',
         'jingle_glue/iq_sender_unittest.cc',
         'jingle_glue/mock_objects.cc',
         'jingle_glue/mock_objects.h',
@@ skipping 12 matching lines @@
         'protocol/fake_session.cc',
         'protocol/fake_session.h',
         'protocol/input_event_tracker_unittest.cc',
         'protocol/input_filter_unittest.cc',
         'protocol/jingle_messages_unittest.cc',
         'protocol/jingle_session_unittest.cc',
         'protocol/message_decoder_unittest.cc',
         'protocol/message_reader_unittest.cc',
         'protocol/mouse_input_filter_unittest.cc',
         'protocol/negotiating_authenticator_unittest.cc',
+        'protocol/ppapi_module_stub.cc',
         'protocol/protocol_mock_objects.cc',
         'protocol/protocol_mock_objects.h',
-        'protocol/ppapi_module_stub.cc',
         'protocol/ssl_hmac_channel_authenticator_unittest.cc',
         'protocol/v2_authenticator_unittest.cc',
       ],
       'conditions': [
         [ 'OS=="win"', {
           'include_dirs': [
             '../breakpad/src',
           ],
           'link_settings': {
             'libraries': [
@@ skipping 28 matching lines @@
             'webapp/format_iq.gtestjs',
             'webapp/format_iq.js',
           ],
         }],
         ['chromeos != 0', {
           'dependencies!': [
             'remoting_host',
             'remoting_host_setup_base',
           ],
           'sources/': [
+            ['exclude', 'capturer/*'],
+            ['exclude', 'codec/*'],
             ['exclude', 'host/*'],
           ]
         }],
         ['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',
             '../build/linux/system.gyp:ssl',
           ],
           'conditions': [
             [ 'linux_use_tcmalloc==1', {
                 'dependencies': [
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }