Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index d3d7999404104dbd7e820475d607101659332a77..9fe41b27e8ba7aa57ac5ec180f07837de00d5215 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -51,6 +51,7 @@ |
'../third_party/opus/opus.gyp:opus', |
'../ui/ui.gyp:ui', |
'../url/url.gyp:url_lib', |
+ '../third_party/webrtc/modules/modules.gyp:desktop_capture', |
], |
'defines': [ |
'MEDIA_IMPLEMENTATION', |
@@ -383,36 +384,11 @@ |
'video/capture/mac/video_capture_device_mac.mm', |
'video/capture/mac/video_capture_device_qtkit_mac.h', |
'video/capture/mac/video_capture_device_qtkit_mac.mm', |
- 'video/capture/screen/differ.cc', |
- 'video/capture/screen/differ.h', |
- 'video/capture/screen/differ_block.cc', |
- 'video/capture/screen/differ_block.h', |
- 'video/capture/screen/mac/desktop_configuration.h', |
- 'video/capture/screen/mac/desktop_configuration.mm', |
- 'video/capture/screen/mac/scoped_pixel_buffer_object.cc', |
- 'video/capture/screen/mac/scoped_pixel_buffer_object.h', |
- 'video/capture/screen/mouse_cursor_shape.h', |
+ |
+ # TODO(sergeyu): Move screen_capture_device.cc to content and remove it |
+ # from here. |
'video/capture/screen/screen_capture_device.cc', |
'video/capture/screen/screen_capture_device.h', |
- 'video/capture/screen/screen_capture_frame_queue.cc', |
- 'video/capture/screen/screen_capture_frame_queue.h', |
- 'video/capture/screen/screen_capturer.h', |
- 'video/capture/screen/screen_capturer_fake.cc', |
- 'video/capture/screen/screen_capturer_fake.h', |
- 'video/capture/screen/screen_capturer_helper.cc', |
- 'video/capture/screen/screen_capturer_helper.h', |
- 'video/capture/screen/screen_capturer_mac.mm', |
- 'video/capture/screen/screen_capturer_null.cc', |
- 'video/capture/screen/screen_capturer_win.cc', |
- 'video/capture/screen/screen_capturer_x11.cc', |
- 'video/capture/screen/shared_desktop_frame.cc', |
- 'video/capture/screen/shared_desktop_frame.h', |
- 'video/capture/screen/win/desktop.cc', |
- 'video/capture/screen/win/desktop.h', |
- 'video/capture/screen/win/scoped_thread_desktop.cc', |
- 'video/capture/screen/win/scoped_thread_desktop.h', |
- 'video/capture/screen/x11/x_server_pixel_buffer.cc', |
- 'video/capture/screen/x11/x_server_pixel_buffer.h', |
'video/capture/video_capture.h', |
'video/capture/video_capture_device.h', |
'video/capture/video_capture_device_dummy.cc', |
@@ -475,11 +451,6 @@ |
'USE_NEON' |
], |
}], |
- ['OS!="linux" or use_x11==1', { |
- 'sources!': [ |
- 'video/capture/screen/screen_capturer_null.cc', |
- ] |
- }], |
['OS!="ios"', { |
'dependencies': [ |
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
@@ -865,15 +836,6 @@ |
'mp4/track_run_iterator.h', |
], |
}], |
- ['screen_capture_supported==1', { |
DaleCurtis
2013/06/06 00:22:42
TODO() remove this? There's a big chunk at the top
Sergey Ulanov
2013/06/06 21:13:58
Done.
|
- 'dependencies': [ |
- '../third_party/webrtc/modules/modules.gyp:desktop_capture', |
- ], |
- }, { |
- 'sources/': [ |
- ['exclude', '^video/capture/screen/'], |
DaleCurtis
2013/06/06 00:22:42
Don't think you can remove this yet, since you'll
Sergey Ulanov
2013/06/06 21:13:58
Done.
|
- ], |
- }], |
['toolkit_uses_gtk==1', { |
'dependencies': [ |
'../build/linux/system.gyp:gtk', |
@@ -1012,12 +974,7 @@ |
'filters/video_decoder_selector_unittest.cc', |
'filters/video_frame_stream_unittest.cc', |
'filters/video_renderer_base_unittest.cc', |
- 'video/capture/screen/differ_block_unittest.cc', |
- 'video/capture/screen/differ_unittest.cc', |
'video/capture/screen/screen_capture_device_unittest.cc', |
- 'video/capture/screen/screen_capturer_helper_unittest.cc', |
- 'video/capture/screen/screen_capturer_mac_unittest.cc', |
- 'video/capture/screen/screen_capturer_unittest.cc', |
alexeypa (please no reviews)
2013/06/06 20:16:20
nit: Do we run |../third_party/webrtc/modules/modu
Sergey Ulanov
2013/06/06 21:13:58
Yes, I enabled them on the webrtc buildbots: http:
|
'video/capture/video_capture_device_unittest.cc', |
'webm/cluster_builder.cc', |
'webm/cluster_builder.h', |
@@ -1173,19 +1130,6 @@ |
'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', { |
- 'dependencies': [ |
- '../third_party/webrtc/modules/modules.gyp:desktop_capture', |
- ], |
- }, { |
- 'sources/': [ |
- ['exclude', '^video/capture/screen/'], |
DaleCurtis
2013/06/06 00:22:42
Ditto.
Sergey Ulanov
2013/06/06 21:13:58
This target no longer depends on desktop_capture m
|
- ], |
- }], |
], |
}, |
], |
@@ -1330,8 +1274,6 @@ |
'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', |
], |
}, |
{ |