zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop relying on GN's sources_assignment_filter.

Browse Source 
Recently, on the gn-dev mailing list [1] and on chromium-dev [2] a
consensus about not using "sources_assignment_filter" [3] has been
reached.

This CL removes the implicit dependency on this feature from the
WebRTC codebase in order to make it easier to remove it from GN [4].

[1] - https://groups.google.com/a/chromium.org/forum/#!topic/gn-dev/oQcYStl_WkI
[2] - https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/hyLuCU6g2V4
[3] - https://gn.googlesource.com/gn/+/master/docs/reference.md#func_set_sources_assignment_filter
[4] - https://bugs.chromium.org/p/gn/issues/detail?id=125

Bug: webrtc:11057
Change-Id: Ia77820f1b4f9dbc47df2b670148b90928860111a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158677
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29648}
This commit is contained in:
Mirko Bonadei
2019-10-29 19:39:17 +01:00
committed by Commit Bot
parent ae40e19805
commit 470b2d5144
3 changed files with 113 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
modules/desktop_capture/BUILD.gn
View File

@ -89,12 +89,16 @@ if (rtc_include_tests) {
"test_utils.cc", "test_utils.cc",
"test_utils.h", "test_utils.h",
"test_utils_unittest.cc", "test_utils_unittest.cc",
"win/cursor_unittest.cc",
"win/cursor_unittest_resources.h",
"win/cursor_unittest_resources.rc",
"win/screen_capture_utils_unittest.cc",
"win/screen_capturer_win_directx_unittest.cc",
] ]
if (is_win) {
sources += [
"win/cursor_unittest.cc",
"win/cursor_unittest_resources.h",
"win/cursor_unittest_resources.rc",
"win/screen_capture_utils_unittest.cc",
"win/screen_capturer_win_directx_unittest.cc",
]
}
deps = [ deps = [
":desktop_capture", ":desktop_capture",
":desktop_capture_mock", ":desktop_capture_mock",
@ -125,11 +129,20 @@ if (rtc_include_tests) {
sources = [ sources = [
"screen_drawer.cc", "screen_drawer.cc",
"screen_drawer.h", "screen_drawer.h",
"screen_drawer_linux.cc",
"screen_drawer_mac.cc",
"screen_drawer_win.cc",
] ]
if (is_linux) {
sources += [ "screen_drawer_linux.cc" ]
}
if (is_mac) {
sources += [ "screen_drawer_mac.cc" ]
}
if (is_win) {
sources += [ "screen_drawer_win.cc" ]
}
deps = [ deps = [
":primitives", ":primitives",
"../../api:scoped_refptr", "../../api:scoped_refptr",
@ -267,7 +280,6 @@ rtc_library("desktop_capture_generic") {
"cropped_desktop_frame.h", "cropped_desktop_frame.h",
"cropping_window_capturer.cc", "cropping_window_capturer.cc",
"cropping_window_capturer.h", "cropping_window_capturer.h",
"cropping_window_capturer_win.cc",
"desktop_and_cursor_composer.cc", "desktop_and_cursor_composer.cc",
"desktop_and_cursor_composer.h", "desktop_and_cursor_composer.h",
"desktop_capture_options.cc", "desktop_capture_options.cc",
@ -282,25 +294,15 @@ rtc_library("desktop_capture_generic") {
"desktop_frame_generator.h", "desktop_frame_generator.h",
"desktop_frame_rotation.cc", "desktop_frame_rotation.cc",
"desktop_frame_rotation.h", "desktop_frame_rotation.h",
"desktop_frame_win.cc",
"desktop_frame_win.h",
"differ_block.cc", "differ_block.cc",
"differ_block.h", "differ_block.h",
"fake_desktop_capturer.cc", "fake_desktop_capturer.cc",
"fake_desktop_capturer.h", "fake_desktop_capturer.h",
"fallback_desktop_capturer_wrapper.cc", "fallback_desktop_capturer_wrapper.cc",
"fallback_desktop_capturer_wrapper.h", "fallback_desktop_capturer_wrapper.h",
"mac/desktop_configuration.h",
"mac/desktop_configuration_monitor.cc",
"mac/desktop_configuration_monitor.h",
"mac/full_screen_chrome_window_detector.cc",
"mac/full_screen_chrome_window_detector.h",
"mac/window_list_utils.cc",
"mac/window_list_utils.h",
"mouse_cursor.cc", "mouse_cursor.cc",
"mouse_cursor.h", "mouse_cursor.h",
"mouse_cursor_monitor.h", "mouse_cursor_monitor.h",
"mouse_cursor_monitor_win.cc",
"resolution_tracker.cc", "resolution_tracker.cc",
"resolution_tracker.h", "resolution_tracker.h",
"rgba_color.cc", "rgba_color.cc",
@ -308,61 +310,34 @@ rtc_library("desktop_capture_generic") {
"screen_capture_frame_queue.h", "screen_capture_frame_queue.h",
"screen_capturer_helper.cc", "screen_capturer_helper.cc",
"screen_capturer_helper.h", "screen_capturer_helper.h",
"screen_capturer_win.cc",
"win/cursor.cc",
"win/cursor.h",
"win/d3d_device.cc",
"win/d3d_device.h",
"win/desktop.cc",
"win/desktop.h",
"win/display_configuration_monitor.cc",
"win/display_configuration_monitor.h",
"win/dxgi_adapter_duplicator.cc",
"win/dxgi_adapter_duplicator.h",
"win/dxgi_context.cc",
"win/dxgi_context.h",
"win/dxgi_duplicator_controller.cc",
"win/dxgi_duplicator_controller.h",
"win/dxgi_frame.cc",
"win/dxgi_frame.h",
"win/dxgi_output_duplicator.cc",
"win/dxgi_output_duplicator.h",
"win/dxgi_texture.cc",
"win/dxgi_texture.h",
"win/dxgi_texture_mapping.cc",
"win/dxgi_texture_mapping.h",
"win/dxgi_texture_staging.cc",
"win/dxgi_texture_staging.h",
"win/scoped_gdi_object.h",
"win/scoped_thread_desktop.cc",
"win/scoped_thread_desktop.h",
"win/screen_capture_utils.cc",
"win/screen_capture_utils.h",
"win/screen_capturer_win_directx.cc",
"win/screen_capturer_win_directx.h",
"win/screen_capturer_win_gdi.cc",
"win/screen_capturer_win_gdi.h",
"win/screen_capturer_win_magnifier.cc",
"win/screen_capturer_win_magnifier.h",
"win/selected_window_context.cc",
"win/selected_window_context.h",
"win/window_capture_utils.cc",
"win/window_capture_utils.h",
"window_capturer_win.cc",
"window_finder.cc", "window_finder.cc",
"window_finder.h", "window_finder.h",
"window_finder_win.cc",
"window_finder_win.h",
] ]
if (is_mac) {
sources += [
"mac/desktop_configuration.h",
"mac/desktop_configuration_monitor.cc",
"mac/desktop_configuration_monitor.h",
"mac/full_screen_chrome_window_detector.cc",
"mac/full_screen_chrome_window_detector.h",
"mac/window_list_utils.cc",
"mac/window_list_utils.h",
]
}
if (build_with_mozilla) { if (build_with_mozilla) {
sources += [ sources += [
"app_capturer_win.cc",
"desktop_device_info.cc", "desktop_device_info.cc",
"desktop_device_info.h", "desktop_device_info.h",
"win/desktop_device_info_win.cc",
"win/win_shared.cc",
] ]
if (is_win) {
sources += [
"app_capturer_win.cc",
"win/desktop_device_info_win.cc",
"win/win_shared.cc",
]
}
} }
if (rtc_use_x11_extensions || rtc_use_pipewire) { if (rtc_use_x11_extensions || rtc_use_pipewire) {
@ -372,8 +347,15 @@ rtc_library("desktop_capture_generic") {
"window_capturer_linux.cc", "window_capturer_linux.cc",
] ]
if (build_with_mozilla) { if (build_with_mozilla && is_linux) {
sources += [ "app_capturer_linux.cc" ] sources += [
"app_capturer_linux.cc",
"linux/app_capturer_x11.cc",
"linux/desktop_device_info_linux.cc",
"linux/desktop_device_info_linux.h",
"linux/shared_x_util.cc",
"linux/shared_x_util.h",
]
} }
} }
@ -408,16 +390,6 @@ rtc_library("desktop_capture_generic") {
"Xfixes", "Xfixes",
"Xrender", "Xrender",
] ]
if (build_with_mozilla) {
sources += [
"linux/app_capturer_x11.cc",
"linux/desktop_device_info_linux.cc",
"linux/desktop_device_info_linux.h",
"linux/shared_x_util.cc",
"linux/shared_x_util.h",
]
}
} }
if (!is_win && !is_mac && !rtc_use_x11_extensions && !rtc_use_pipewire) { if (!is_win && !is_mac && !rtc_use_x11_extensions && !rtc_use_pipewire) {
@ -429,6 +401,55 @@ rtc_library("desktop_capture_generic") {
} }
if (is_win) { if (is_win) {
sources += [
"cropping_window_capturer_win.cc",
"desktop_frame_win.cc",
"desktop_frame_win.h",
"mouse_cursor_monitor_win.cc",
"screen_capturer_win.cc",
"win/cursor.cc",
"win/cursor.h",
"win/d3d_device.cc",
"win/d3d_device.h",
"win/desktop.cc",
"win/desktop.h",
"win/display_configuration_monitor.cc",
"win/display_configuration_monitor.h",
"win/dxgi_adapter_duplicator.cc",
"win/dxgi_adapter_duplicator.h",
"win/dxgi_context.cc",
"win/dxgi_context.h",
"win/dxgi_duplicator_controller.cc",
"win/dxgi_duplicator_controller.h",
"win/dxgi_frame.cc",
"win/dxgi_frame.h",
"win/dxgi_output_duplicator.cc",
"win/dxgi_output_duplicator.h",
"win/dxgi_texture.cc",
"win/dxgi_texture.h",
"win/dxgi_texture_mapping.cc",
"win/dxgi_texture_mapping.h",
"win/dxgi_texture_staging.cc",
"win/dxgi_texture_staging.h",
"win/scoped_gdi_object.h",
"win/scoped_thread_desktop.cc",
"win/scoped_thread_desktop.h",
"win/screen_capture_utils.cc",
"win/screen_capture_utils.h",
"win/screen_capturer_win_directx.cc",
"win/screen_capturer_win_directx.h",
"win/screen_capturer_win_gdi.cc",
"win/screen_capturer_win_gdi.h",
"win/screen_capturer_win_magnifier.cc",
"win/screen_capturer_win_magnifier.h",
"win/selected_window_context.cc",
"win/selected_window_context.h",
"win/window_capture_utils.cc",
"win/window_capture_utils.h",
"window_capturer_win.cc",
"window_finder_win.cc",
"window_finder_win.h",
]
libs = [ libs = [
"d3d11.lib", "d3d11.lib",
"dxgi.lib", "dxgi.lib",

13
modules/utility/BUILD.gn
View File

@ -11,15 +11,20 @@ import("../../webrtc.gni")
rtc_library("utility") { rtc_library("utility") {
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"include/helpers_android.h",
"include/jvm_android.h",
"include/process_thread.h", "include/process_thread.h",
"source/helpers_android.cc",
"source/jvm_android.cc",
"source/process_thread_impl.cc", "source/process_thread_impl.cc",
"source/process_thread_impl.h", "source/process_thread_impl.h",
] ]
if (is_android) {
sources += [
"include/helpers_android.h",
"include/jvm_android.h",
"source/helpers_android.cc",
"source/jvm_android.cc",
]
}
if (is_ios) { if (is_ios) {
libs = [ "AVFoundation.framework" ] libs = [ "AVFoundation.framework" ]
} }

8
test/BUILD.gn
View File

@ -847,8 +847,6 @@ rtc_library("test_renderer_generic") {
sources = [ sources = [
"video_renderer.cc", "video_renderer.cc",
"video_renderer.h", "video_renderer.h",
"win/d3d_renderer.cc",
"win/d3d_renderer.h",
] ]
deps = [ deps = [
":test_support", ":test_support",
@ -861,6 +859,12 @@ rtc_library("test_renderer_generic") {
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
"//testing/gtest", "//testing/gtest",
] ]
if (is_win) {
sources += [
"win/d3d_renderer.cc",
"win/d3d_renderer.h",
]
}
if (!(is_linux && rtc_use_x11) && !is_mac && !is_win) { if (!(is_linux && rtc_use_x11) && !is_mac && !is_win) {
sources += [ "null_platform_renderer.cc" ] sources += [ "null_platform_renderer.cc" ]
} }