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

Unified 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: q Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/video/capture/screen/DEPS » ('j') | media/video/capture/screen/differ.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index a49fc64483ae7795f59d88fddcec100a5883ab83..51509c022e161c76b4c8e4287b611936b748ea81 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -50,6 +50,7 @@
'../crypto/crypto.gyp:crypto',
'../skia/skia.gyp:skia',
'../third_party/opus/opus.gyp:opus',
+ '../third_party/webrtc/modules/modules.gyp:desktop_capture',
'../ui/ui.gyp:ui',
],
'defines': [
@@ -373,12 +374,8 @@
'video/capture/screen/mac/scoped_pixel_buffer_object.h',
'video/capture/screen/mouse_cursor_shape.cc',
'video/capture/screen/mouse_cursor_shape.h',
- 'video/capture/screen/screen_capture_data.cc',
- 'video/capture/screen/screen_capture_data.h',
'video/capture/screen/screen_capture_device.cc',
'video/capture/screen/screen_capture_device.h',
- 'video/capture/screen/screen_capture_frame.cc',
- 'video/capture/screen/screen_capture_frame.h',
'video/capture/screen/screen_capture_frame_queue.cc',
'video/capture/screen/screen_capture_frame_queue.h',
'video/capture/screen/screen_capturer.h',
@@ -390,8 +387,6 @@
'video/capture/screen/screen_capturer_mac.mm',
'video/capture/screen/screen_capturer_null.cc',
'video/capture/screen/screen_capturer_win.cc',
- 'video/capture/screen/shared_buffer.cc',
- 'video/capture/screen/shared_buffer.h',
'video/capture/screen/win/desktop.cc',
'video/capture/screen/win/desktop.h',
'video/capture/screen/win/scoped_thread_desktop.cc',
@@ -994,7 +989,6 @@
'filters/video_renderer_base_unittest.cc',
'video/capture/screen/differ_block_unittest.cc',
'video/capture/screen/differ_unittest.cc',
- 'video/capture/screen/shared_buffer_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',
@@ -1130,6 +1124,7 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../third_party/webrtc/modules/modules.gyp:desktop_capture',
],
'sources': [
'audio/mock_audio_manager.cc',
« no previous file with comments | « no previous file | media/video/capture/screen/DEPS » ('j') | media/video/capture/screen/differ.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698