Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(535)

Side by Side Diff: media/media.gyp

Issue 13983010: Use webrtc::DesktopCapturer for screen capturer implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | media/video/capture/screen/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 'targets': [ 43 'targets': [
44 { 44 {
45 'target_name': 'media', 45 'target_name': 'media',
46 'type': '<(component)', 46 'type': '<(component)',
47 'dependencies': [ 47 'dependencies': [
48 '../base/base.gyp:base', 48 '../base/base.gyp:base',
49 '../build/temp_gyp/googleurl.gyp:googleurl', 49 '../build/temp_gyp/googleurl.gyp:googleurl',
50 '../crypto/crypto.gyp:crypto', 50 '../crypto/crypto.gyp:crypto',
51 '../skia/skia.gyp:skia', 51 '../skia/skia.gyp:skia',
52 '../third_party/opus/opus.gyp:opus', 52 '../third_party/opus/opus.gyp:opus',
53 '../third_party/webrtc/modules/modules.gyp:desktop_capture',
53 '../ui/ui.gyp:ui', 54 '../ui/ui.gyp:ui',
54 ], 55 ],
55 'defines': [ 56 'defines': [
56 'MEDIA_IMPLEMENTATION', 57 'MEDIA_IMPLEMENTATION',
57 ], 58 ],
58 'include_dirs': [ 59 'include_dirs': [
59 '..', 60 '..',
60 ], 61 ],
61 'sources': [ 62 'sources': [
62 'audio/android/audio_manager_android.cc', 63 'audio/android/audio_manager_android.cc',
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 'video/capture/linux/video_capture_device_linux.cc', 362 'video/capture/linux/video_capture_device_linux.cc',
362 'video/capture/linux/video_capture_device_linux.h', 363 'video/capture/linux/video_capture_device_linux.h',
363 'video/capture/mac/video_capture_device_mac.h', 364 'video/capture/mac/video_capture_device_mac.h',
364 'video/capture/mac/video_capture_device_mac.mm', 365 'video/capture/mac/video_capture_device_mac.mm',
365 'video/capture/mac/video_capture_device_qtkit_mac.h', 366 'video/capture/mac/video_capture_device_qtkit_mac.h',
366 'video/capture/mac/video_capture_device_qtkit_mac.mm', 367 'video/capture/mac/video_capture_device_qtkit_mac.mm',
367 'video/capture/screen/differ.cc', 368 'video/capture/screen/differ.cc',
368 'video/capture/screen/differ.h', 369 'video/capture/screen/differ.h',
369 'video/capture/screen/differ_block.cc', 370 'video/capture/screen/differ_block.cc',
370 'video/capture/screen/differ_block.h', 371 'video/capture/screen/differ_block.h',
371 'video/capture/screen/x11/x_server_pixel_buffer.cc', 372 'video/capture/screen/mac/desktop_configuration.h',
372 'video/capture/screen/x11/x_server_pixel_buffer.h',
373 'video/capture/screen/mac/desktop_configuration.mm', 373 'video/capture/screen/mac/desktop_configuration.mm',
374 'video/capture/screen/mac/desktop_configuration.h',
375 'video/capture/screen/mac/scoped_pixel_buffer_object.cc', 374 'video/capture/screen/mac/scoped_pixel_buffer_object.cc',
376 'video/capture/screen/mac/scoped_pixel_buffer_object.h', 375 'video/capture/screen/mac/scoped_pixel_buffer_object.h',
377 'video/capture/screen/mouse_cursor_shape.cc',
378 'video/capture/screen/mouse_cursor_shape.h', 376 'video/capture/screen/mouse_cursor_shape.h',
379 'video/capture/screen/screen_capture_data.cc',
380 'video/capture/screen/screen_capture_data.h',
381 'video/capture/screen/screen_capture_device.cc', 377 'video/capture/screen/screen_capture_device.cc',
382 'video/capture/screen/screen_capture_device.h', 378 'video/capture/screen/screen_capture_device.h',
383 'video/capture/screen/screen_capture_frame.cc',
384 'video/capture/screen/screen_capture_frame.h',
385 'video/capture/screen/screen_capture_frame_queue.cc', 379 'video/capture/screen/screen_capture_frame_queue.cc',
386 'video/capture/screen/screen_capture_frame_queue.h', 380 'video/capture/screen/screen_capture_frame_queue.h',
387 'video/capture/screen/screen_capturer.h', 381 'video/capture/screen/screen_capturer.h',
388 'video/capture/screen/screen_capturer_fake.cc', 382 'video/capture/screen/screen_capturer_fake.cc',
389 'video/capture/screen/screen_capturer_fake.h', 383 'video/capture/screen/screen_capturer_fake.h',
390 'video/capture/screen/screen_capturer_helper.cc', 384 'video/capture/screen/screen_capturer_helper.cc',
391 'video/capture/screen/screen_capturer_helper.h', 385 'video/capture/screen/screen_capturer_helper.h',
392 'video/capture/screen/screen_capturer_x11.cc',
393 'video/capture/screen/screen_capturer_mac.mm', 386 'video/capture/screen/screen_capturer_mac.mm',
394 'video/capture/screen/screen_capturer_null.cc', 387 'video/capture/screen/screen_capturer_null.cc',
395 'video/capture/screen/screen_capturer_win.cc', 388 'video/capture/screen/screen_capturer_win.cc',
396 'video/capture/screen/shared_buffer.cc', 389 'video/capture/screen/screen_capturer_x11.cc',
397 'video/capture/screen/shared_buffer.h', 390 'video/capture/screen/shared_desktop_frame.cc',
391 'video/capture/screen/shared_desktop_frame.h',
398 'video/capture/screen/win/desktop.cc', 392 'video/capture/screen/win/desktop.cc',
399 'video/capture/screen/win/desktop.h', 393 'video/capture/screen/win/desktop.h',
400 'video/capture/screen/win/scoped_thread_desktop.cc', 394 'video/capture/screen/win/scoped_thread_desktop.cc',
401 'video/capture/screen/win/scoped_thread_desktop.h', 395 'video/capture/screen/win/scoped_thread_desktop.h',
396 'video/capture/screen/x11/x_server_pixel_buffer.cc',
397 'video/capture/screen/x11/x_server_pixel_buffer.h',
402 'video/capture/video_capture.h', 398 'video/capture/video_capture.h',
403 'video/capture/video_capture_device.h', 399 'video/capture/video_capture_device.h',
404 'video/capture/video_capture_device_dummy.cc', 400 'video/capture/video_capture_device_dummy.cc',
405 'video/capture/video_capture_device_dummy.h', 401 'video/capture/video_capture_device_dummy.h',
406 'video/capture/video_capture_proxy.cc', 402 'video/capture/video_capture_proxy.cc',
407 'video/capture/video_capture_proxy.h', 403 'video/capture/video_capture_proxy.h',
408 'video/capture/video_capture_types.h', 404 'video/capture/video_capture_types.h',
409 'video/capture/win/capability_list_win.cc', 405 'video/capture/win/capability_list_win.cc',
410 'video/capture/win/capability_list_win.h', 406 'video/capture/win/capability_list_win.h',
411 'video/capture/win/filter_base_win.cc', 407 'video/capture/win/filter_base_win.cc',
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 'dependencies': [ 886 'dependencies': [
891 'media', 887 'media',
892 'media_test_support', 888 'media_test_support',
893 '../base/base.gyp:base', 889 '../base/base.gyp:base',
894 '../base/base.gyp:base_i18n', 890 '../base/base.gyp:base_i18n',
895 '../base/base.gyp:test_support_base', 891 '../base/base.gyp:test_support_base',
896 '../skia/skia.gyp:skia', 892 '../skia/skia.gyp:skia',
897 '../testing/gmock.gyp:gmock', 893 '../testing/gmock.gyp:gmock',
898 '../testing/gtest.gyp:gtest', 894 '../testing/gtest.gyp:gtest',
899 '../ui/ui.gyp:ui', 895 '../ui/ui.gyp:ui',
896 '../third_party/webrtc/modules/modules.gyp:desktop_capture',
900 ], 897 ],
901 'sources': [ 898 'sources': [
902 'audio/async_socket_io_handler_unittest.cc', 899 'audio/async_socket_io_handler_unittest.cc',
903 'audio/audio_input_controller_unittest.cc', 900 'audio/audio_input_controller_unittest.cc',
904 'audio/audio_input_device_unittest.cc', 901 'audio/audio_input_device_unittest.cc',
905 'audio/audio_input_unittest.cc', 902 'audio/audio_input_unittest.cc',
906 'audio/audio_input_volume_unittest.cc', 903 'audio/audio_input_volume_unittest.cc',
907 'audio/audio_low_latency_input_output_unittest.cc', 904 'audio/audio_low_latency_input_output_unittest.cc',
908 'audio/audio_output_controller_unittest.cc', 905 'audio/audio_output_controller_unittest.cc',
909 'audio/audio_output_device_unittest.cc', 906 'audio/audio_output_device_unittest.cc',
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
980 'filters/h264_to_annex_b_bitstream_converter_unittest.cc', 977 'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
981 'filters/pipeline_integration_test.cc', 978 'filters/pipeline_integration_test.cc',
982 'filters/pipeline_integration_test_base.cc', 979 'filters/pipeline_integration_test_base.cc',
983 'filters/skcanvas_video_renderer_unittest.cc', 980 'filters/skcanvas_video_renderer_unittest.cc',
984 'filters/source_buffer_stream_unittest.cc', 981 'filters/source_buffer_stream_unittest.cc',
985 'filters/video_decoder_selector_unittest.cc', 982 'filters/video_decoder_selector_unittest.cc',
986 'filters/video_frame_stream_unittest.cc', 983 'filters/video_frame_stream_unittest.cc',
987 'filters/video_renderer_base_unittest.cc', 984 'filters/video_renderer_base_unittest.cc',
988 'video/capture/screen/differ_block_unittest.cc', 985 'video/capture/screen/differ_block_unittest.cc',
989 'video/capture/screen/differ_unittest.cc', 986 'video/capture/screen/differ_unittest.cc',
990 'video/capture/screen/shared_buffer_unittest.cc',
991 'video/capture/screen/screen_capture_device_unittest.cc', 987 'video/capture/screen/screen_capture_device_unittest.cc',
992 'video/capture/screen/screen_capturer_helper_unittest.cc', 988 'video/capture/screen/screen_capturer_helper_unittest.cc',
993 'video/capture/screen/screen_capturer_mac_unittest.cc', 989 'video/capture/screen/screen_capturer_mac_unittest.cc',
994 'video/capture/screen/screen_capturer_unittest.cc', 990 'video/capture/screen/screen_capturer_unittest.cc',
995 'video/capture/video_capture_device_unittest.cc', 991 'video/capture/video_capture_device_unittest.cc',
996 'webm/cluster_builder.cc', 992 'webm/cluster_builder.cc',
997 'webm/cluster_builder.h', 993 'webm/cluster_builder.h',
998 'webm/webm_cluster_parser_unittest.cc', 994 'webm/webm_cluster_parser_unittest.cc',
999 'webm/webm_content_encodings_client_unittest.cc', 995 'webm/webm_content_encodings_client_unittest.cc',
1000 'webm/webm_parser_unittest.cc', 996 'webm/webm_parser_unittest.cc',
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
1086 ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', { 1082 ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', {
1087 'sources': [ 1083 'sources': [
1088 'base/simd/convert_rgb_to_yuv_unittest.cc', 1084 'base/simd/convert_rgb_to_yuv_unittest.cc',
1089 ], 1085 ],
1090 'dependencies': [ 1086 'dependencies': [
1091 'media_sse', 1087 'media_sse',
1092 ], 1088 ],
1093 }], 1089 }],
1094 ['screen_capture_supported == 0', { 1090 ['screen_capture_supported == 0', {
1095 'sources/': [ 1091 'sources/': [
1096 ['exclude', '^video/capture/screen/'], 1092 ['exclude', '^video/capture/screen/'],
Ami GONE FROM CHROMIUM 2013/05/13 23:48:33 Do you need a similar exclusion for the webrtc mod
Sergey Ulanov 2013/05/14 00:20:23 Done.
1097 ], 1093 ],
1098 }], 1094 }],
1099 ['proprietary_codecs==1 or branding=="Chrome"', { 1095 ['proprietary_codecs==1 or branding=="Chrome"', {
1100 'sources': [ 1096 'sources': [
1101 'mp4/aac_unittest.cc', 1097 'mp4/aac_unittest.cc',
1102 'mp4/avc_unittest.cc', 1098 'mp4/avc_unittest.cc',
1103 'mp4/box_reader_unittest.cc', 1099 'mp4/box_reader_unittest.cc',
1104 'mp4/es_descriptor_unittest.cc', 1100 'mp4/es_descriptor_unittest.cc',
1105 'mp4/mp4_stream_parser_unittest.cc', 1101 'mp4/mp4_stream_parser_unittest.cc',
1106 'mp4/offset_byte_queue_unittest.cc', 1102 'mp4/offset_byte_queue_unittest.cc',
1107 'mp4/track_run_iterator_unittest.cc', 1103 'mp4/track_run_iterator_unittest.cc',
1108 ], 1104 ],
1109 }], 1105 }],
1110 # TODO(wolenetz): Fix size_t to int truncations in win64. See 1106 # TODO(wolenetz): Fix size_t to int truncations in win64. See
1111 # http://crbug.com/171009 1107 # http://crbug.com/171009
1112 ['OS=="win" and target_arch=="x64"', { 1108 ['OS=="win" and target_arch=="x64"', {
1113 'msvs_disabled_warnings': [ 4267, ], 1109 'msvs_disabled_warnings': [ 4267, ],
1114 }], 1110 }],
1115 ], 1111 ],
1116 }, 1112 },
1117 { 1113 {
1118 'target_name': 'media_test_support', 1114 'target_name': 'media_test_support',
1119 'type': 'static_library', 1115 'type': 'static_library',
1120 'dependencies': [ 1116 'dependencies': [
1121 'media', 1117 'media',
1122 '../base/base.gyp:base', 1118 '../base/base.gyp:base',
1123 '../skia/skia.gyp:skia', 1119 '../skia/skia.gyp:skia',
1124 '../testing/gmock.gyp:gmock', 1120 '../testing/gmock.gyp:gmock',
1125 '../testing/gtest.gyp:gtest', 1121 '../testing/gtest.gyp:gtest',
1122 '../third_party/webrtc/modules/modules.gyp:desktop_capture',
Ami GONE FROM CHROMIUM 2013/05/13 23:48:33 Generally this (linking a dep into a static_librar
Sergey Ulanov 2013/05/14 00:20:23 It's needed here because the tests include headers
1126 ], 1123 ],
1127 'sources': [ 1124 'sources': [
1128 'audio/mock_audio_manager.cc', 1125 'audio/mock_audio_manager.cc',
1129 'audio/mock_audio_manager.h', 1126 'audio/mock_audio_manager.h',
1130 'audio/test_audio_input_controller_factory.cc', 1127 'audio/test_audio_input_controller_factory.cc',
1131 'audio/test_audio_input_controller_factory.h', 1128 'audio/test_audio_input_controller_factory.h',
1132 'base/fake_audio_render_callback.cc', 1129 'base/fake_audio_render_callback.cc',
1133 'base/fake_audio_render_callback.h', 1130 'base/fake_audio_render_callback.h',
1134 'base/gmock_callback_support.h', 1131 'base/gmock_callback_support.h',
1135 'base/mock_audio_renderer_sink.cc', 1132 'base/mock_audio_renderer_sink.cc',
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
1712 ], 1709 ],
1713 'sources': [ 1710 'sources': [
1714 'base/simd/sinc_resampler_sse.cc', 1711 'base/simd/sinc_resampler_sse.cc',
1715 'base/simd/vector_math_sse.cc', 1712 'base/simd/vector_math_sse.cc',
1716 ], 1713 ],
1717 }, # end of target media_sse 1714 }, # end of target media_sse
1718 ], 1715 ],
1719 }], 1716 }],
1720 ], 1717 ],
1721 } 1718 }
OLDNEW
« no previous file with comments | « no previous file | media/video/capture/screen/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698