Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 | 8 |
| 9 import("//build/config/linux/pkg_config.gni") | 9 import("//build/config/linux/pkg_config.gni") |
| 10 import("../webrtc.gni") | 10 import("../webrtc.gni") |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 "$rtc_libyuv_dir", | 92 "$rtc_libyuv_dir", |
| 93 ] | 93 ] |
| 94 } else { | 94 } else { |
| 95 # Need to add a directory normally exported by libyuv. | 95 # Need to add a directory normally exported by libyuv. |
| 96 include_dirs += [ "$rtc_libyuv_dir/include" ] | 96 include_dirs += [ "$rtc_libyuv_dir/include" ] |
| 97 } | 97 } |
| 98 | 98 |
| 99 deps += [ | 99 deps += [ |
| 100 "..:webrtc_common", | 100 "..:webrtc_common", |
| 101 "../api:libjingle_peerconnection_api", | 101 "../api:libjingle_peerconnection_api", |
| 102 "../api:video_frame_api", | |
| 103 "../api/audio_codecs:audio_codecs_api", | 102 "../api/audio_codecs:audio_codecs_api", |
| 104 "../api/audio_codecs:builtin_audio_encoder_factory", | |
| 105 "../base:rtc_base", | 103 "../base:rtc_base", |
| 106 "../base:rtc_base_approved", | 104 "../base:rtc_base_approved", |
| 107 "../call:call_interfaces", | 105 "../call:call_interfaces", |
| 108 "../common_video:common_video", | |
| 109 "../p2p", | 106 "../p2p", |
| 110 ] | 107 ] |
| 111 | 108 |
| 112 if (is_nacl) { | 109 if (is_nacl) { |
| 113 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] | 110 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] |
| 114 } | 111 } |
| 112 | |
| 113 if (rtc_enable_media) { | |
| 114 deps += [ | |
| 115 "../api:video_frame_api", | |
| 116 "../api/audio_codecs:builtin_audio_encoder_factory", | |
| 117 "../common_video:common_video", | |
| 118 "../modules/audio_coding:builtin_audio_encoder_factory", | |
| 119 ] | |
| 120 } | |
| 115 } | 121 } |
| 116 | 122 |
| 117 rtc_static_library("rtc_media") { | 123 rtc_static_library("rtc_media") { |
| 118 # TODO(kjellander): Remove (bugs.webrtc.org/6828) | 124 # TODO(kjellander): Remove (bugs.webrtc.org/6828) |
| 119 # Enabling GN check triggers cyclic dependency error: | 125 # Enabling GN check triggers cyclic dependency error: |
| 120 # //webrtc/media:media -> | 126 # //webrtc/media:media -> |
| 121 # //webrtc/media:rtc_media -> | 127 # //webrtc/media:rtc_media -> |
| 122 # //webrtc/pc:rtc_pc -> | 128 # //webrtc/pc:rtc_pc -> |
| 123 # //webrtc/media:media | 129 # //webrtc/media:media |
| 124 check_includes = false | 130 check_includes = false |
| 125 defines = [] | 131 defines = [] |
| 126 libs = [] | 132 libs = [] |
| 127 deps = [] | 133 deps = [] |
| 128 sources = [ | 134 sources = [ |
| 129 "engine/adm_helpers.cc", | |
| 130 "engine/adm_helpers.h", | |
| 131 "engine/apm_helpers.cc", | |
| 132 "engine/apm_helpers.h", | |
| 133 "engine/internaldecoderfactory.cc", | |
| 134 "engine/internaldecoderfactory.h", | |
| 135 "engine/internalencoderfactory.cc", | |
| 136 "engine/internalencoderfactory.h", | |
| 137 "engine/nullwebrtcvideoengine.h", | |
| 138 "engine/payload_type_mapper.cc", | |
| 139 "engine/payload_type_mapper.h", | |
| 140 "engine/simulcast.cc", | |
| 141 "engine/simulcast.h", | |
| 142 "engine/videodecodersoftwarefallbackwrapper.cc", | |
| 143 "engine/videodecodersoftwarefallbackwrapper.h", | |
| 144 "engine/videoencodersoftwarefallbackwrapper.cc", | |
| 145 "engine/videoencodersoftwarefallbackwrapper.h", | |
| 146 "engine/webrtccommon.h", | |
| 147 "engine/webrtcmediaengine.cc", | |
| 148 "engine/webrtcmediaengine.h", | |
| 149 "engine/webrtcvideocapturer.cc", | |
| 150 "engine/webrtcvideocapturer.h", | |
| 151 "engine/webrtcvideocapturerfactory.cc", | |
| 152 "engine/webrtcvideocapturerfactory.h", | |
| 153 "engine/webrtcvideodecoderfactory.h", | 135 "engine/webrtcvideodecoderfactory.h", |
| 154 "engine/webrtcvideoencoderfactory.cc", | 136 "engine/webrtcvideoencoderfactory.cc", |
| 155 "engine/webrtcvideoencoderfactory.h", | 137 "engine/webrtcvideoencoderfactory.h", |
|
Taylor Brandstetter
2017/05/03 22:50:57
What would it take to move these files into the "i
Zhi Huang
2017/05/04 01:08:02
The dependency chain is:
peerconnection_integratio
pthatcher1
2017/05/05 01:45:12
If they do, it will be really easy to know and fix
| |
| 156 "engine/webrtcvideoengine2.cc", | |
| 157 "engine/webrtcvideoengine2.h", | |
| 158 "engine/webrtcvideoframe.h", | |
| 159 "engine/webrtcvoe.h", | |
| 160 "engine/webrtcvoiceengine.cc", | |
| 161 "engine/webrtcvoiceengine.h", | |
| 162 "sctp/sctptransportinternal.h", | 138 "sctp/sctptransportinternal.h", |
| 163 ] | 139 ] |
| 164 | 140 |
| 165 if (rtc_enable_sctp) { | 141 if (rtc_enable_sctp) { |
| 166 sources += [ | 142 sources += [ |
| 167 "sctp/sctptransport.cc", | 143 "sctp/sctptransport.cc", |
| 168 "sctp/sctptransport.h", | 144 "sctp/sctptransport.h", |
| 169 ] | 145 ] |
| 170 } | 146 } |
| 171 | 147 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 221 deps += [ "../modules/video_capture:video_capture" ] | 197 deps += [ "../modules/video_capture:video_capture" ] |
| 222 } else { | 198 } else { |
| 223 public_configs += [ ":rtc_media_defines_config" ] | 199 public_configs += [ ":rtc_media_defines_config" ] |
| 224 deps += [ "../modules/video_capture:video_capture_internal_impl" ] | 200 deps += [ "../modules/video_capture:video_capture_internal_impl" ] |
| 225 } | 201 } |
| 226 deps += [ | 202 deps += [ |
| 227 ":rtc_media_base", | 203 ":rtc_media_base", |
| 228 "..:webrtc_common", | 204 "..:webrtc_common", |
| 229 "../api:call_api", | 205 "../api:call_api", |
| 230 "../api:transport_api", | 206 "../api:transport_api", |
| 231 "../api:video_frame_api", | |
| 232 "../api/audio_codecs:audio_codecs_api", | 207 "../api/audio_codecs:audio_codecs_api", |
| 233 "../api/audio_codecs:builtin_audio_decoder_factory", | |
| 234 "../api/video_codecs:video_codecs_api", | 208 "../api/video_codecs:video_codecs_api", |
| 235 "../base:rtc_base", | 209 "../base:rtc_base", |
| 236 "../base:rtc_base_approved", | 210 "../base:rtc_base_approved", |
| 237 "../call", | |
| 238 "../common_video:common_video", | |
| 239 "../modules/audio_coding:rent_a_codec", | |
| 240 "../modules/audio_device:audio_device", | |
| 241 "../modules/audio_mixer:audio_mixer_impl", | |
| 242 "../modules/audio_processing:audio_processing", | |
| 243 "../modules/video_capture:video_capture_module", | |
| 244 "../modules/video_coding", | |
| 245 "../modules/video_coding:webrtc_h264", | |
| 246 "../modules/video_coding:webrtc_vp8", | |
| 247 "../modules/video_coding:webrtc_vp9", | |
| 248 "../p2p:rtc_p2p", | 211 "../p2p:rtc_p2p", |
| 249 "../system_wrappers", | 212 "../system_wrappers", |
| 250 "../video", | |
| 251 "../voice_engine", | |
| 252 ] | 213 ] |
| 214 | |
| 215 if (rtc_enable_media) { | |
| 216 sources += [ | |
| 217 "engine/adm_helpers.cc", | |
| 218 "engine/adm_helpers.h", | |
| 219 "engine/apm_helpers.cc", | |
| 220 "engine/apm_helpers.h", | |
| 221 "engine/internaldecoderfactory.cc", | |
| 222 "engine/internaldecoderfactory.h", | |
| 223 "engine/internalencoderfactory.cc", | |
| 224 "engine/internalencoderfactory.h", | |
| 225 "engine/nullwebrtcvideoengine.h", | |
| 226 "engine/payload_type_mapper.cc", | |
| 227 "engine/payload_type_mapper.h", | |
| 228 "engine/simulcast.cc", | |
| 229 "engine/simulcast.h", | |
| 230 "engine/videodecodersoftwarefallbackwrapper.cc", | |
| 231 "engine/videodecodersoftwarefallbackwrapper.h", | |
| 232 "engine/videoencodersoftwarefallbackwrapper.cc", | |
| 233 "engine/videoencodersoftwarefallbackwrapper.h", | |
| 234 "engine/webrtccommon.h", | |
| 235 "engine/webrtcmediaengine.cc", | |
| 236 "engine/webrtcmediaengine.h", | |
| 237 "engine/webrtcvideocapturer.cc", | |
| 238 "engine/webrtcvideocapturer.h", | |
| 239 "engine/webrtcvideocapturerfactory.cc", | |
| 240 "engine/webrtcvideocapturerfactory.h", | |
| 241 "engine/webrtcvideoengine2.cc", | |
| 242 "engine/webrtcvideoengine2.h", | |
| 243 "engine/webrtcvideoframe.h", | |
| 244 "engine/webrtcvoe.h", | |
| 245 "engine/webrtcvoiceengine.cc", | |
| 246 "engine/webrtcvoiceengine.h", | |
| 247 ] | |
| 248 | |
| 249 deps += [ | |
| 250 "../api:video_frame_api", | |
| 251 "../api/audio_codecs:builtin_audio_decoder_factory", | |
| 252 "../call", | |
| 253 "../common_video:common_video", | |
| 254 "../modules/audio_coding:rent_a_codec", | |
| 255 "../modules/audio_device:audio_device", | |
| 256 "../modules/audio_mixer:audio_mixer_impl", | |
| 257 "../modules/audio_processing:audio_processing", | |
| 258 "../modules/video_capture:video_capture_module", | |
| 259 "../modules/video_coding", | |
| 260 "../modules/video_coding:webrtc_h264", | |
| 261 "../modules/video_coding:webrtc_vp8", | |
| 262 "../modules/video_coding:webrtc_vp9", | |
| 263 "../video", | |
| 264 "../voice_engine", | |
| 265 ] | |
| 266 } | |
| 253 } | 267 } |
| 254 | 268 |
| 255 if (rtc_include_tests) { | 269 if (rtc_include_tests) { |
| 256 config("rtc_unittest_main_config") { | 270 config("rtc_unittest_main_config") { |
| 257 # GN orders flags on a target before flags from configs. The default config | 271 # GN orders flags on a target before flags from configs. The default config |
| 258 # adds -Wall, and this flag have to be after -Wall -- so they need to | 272 # adds -Wall, and this flag have to be after -Wall -- so they need to |
| 259 # come from a config and can"t be on the target directly. | 273 # come from a config and can"t be on the target directly. |
| 260 if (is_clang && is_ios) { | 274 if (is_clang && is_ios) { |
| 261 cflags = [ "-Wno-unused-variable" ] | 275 cflags = [ "-Wno-unused-variable" ] |
| 262 } | 276 } |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 309 deps += [ | 323 deps += [ |
| 310 ":rtc_media", | 324 ":rtc_media", |
| 311 ":rtc_media_base", | 325 ":rtc_media_base", |
| 312 "..:webrtc_common", | 326 "..:webrtc_common", |
| 313 "../api:call_api", | 327 "../api:call_api", |
| 314 "../api:video_frame_api", | 328 "../api:video_frame_api", |
| 315 "../api/video_codecs:video_codecs_api", | 329 "../api/video_codecs:video_codecs_api", |
| 316 "../base:rtc_base", | 330 "../base:rtc_base", |
| 317 "../base:rtc_base_approved", | 331 "../base:rtc_base_approved", |
| 318 "../base:rtc_base_tests_utils", | 332 "../base:rtc_base_tests_utils", |
| 319 "../call:call_interfaces", | 333 "../call", |
| 320 "../test:test_support", | 334 "../test:test_support", |
| 321 "//testing/gtest", | 335 "//testing/gtest", |
| 322 ] | 336 ] |
| 323 public_deps += [ "//testing/gmock" ] | 337 public_deps += [ "//testing/gmock" ] |
| 324 } | 338 } |
| 325 | 339 |
| 326 config("rtc_media_unittests_config") { | 340 config("rtc_media_unittests_config") { |
| 327 # GN orders flags on a target before flags from configs. The default config | 341 # GN orders flags on a target before flags from configs. The default config |
| 328 # adds -Wall, and this flag have to be after -Wall -- so they need to | 342 # adds -Wall, and this flag have to be after -Wall -- so they need to |
| 329 # come from a config and can"t be on the target directly. | 343 # come from a config and can"t be on the target directly. |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 436 } | 450 } |
| 437 | 451 |
| 438 if (is_ios) { | 452 if (is_ios) { |
| 439 deps += [ ":rtc_media_unittests_bundle_data" ] | 453 deps += [ ":rtc_media_unittests_bundle_data" ] |
| 440 } | 454 } |
| 441 | 455 |
| 442 deps += [ | 456 deps += [ |
| 443 ":rtc_media", | 457 ":rtc_media", |
| 444 ":rtc_media_base", | 458 ":rtc_media_base", |
| 445 ":rtc_media_tests_utils", | 459 ":rtc_media_tests_utils", |
| 446 "../api:video_frame_api", | |
| 447 "../api/audio_codecs:builtin_audio_decoder_factory", | |
| 448 "../api/audio_codecs:builtin_audio_encoder_factory", | |
| 449 "../api/video_codecs:video_codecs_api", | 460 "../api/video_codecs:video_codecs_api", |
| 450 "../audio", | 461 "../audio", |
| 451 "../base:rtc_base", | 462 "../base:rtc_base", |
| 452 "../base:rtc_base_approved", | 463 "../base:rtc_base_approved", |
| 453 "../base:rtc_base_tests_main", | 464 "../base:rtc_base_tests_main", |
| 454 "../base:rtc_base_tests_utils", | 465 "../base:rtc_base_tests_utils", |
| 455 "../call:call_interfaces", | 466 "../call:call_interfaces", |
| 456 "../common_video:common_video", | |
| 457 "../logging:rtc_event_log_api", | 467 "../logging:rtc_event_log_api", |
| 458 "../modules/audio_device:mock_audio_device", | 468 "../modules/audio_device:mock_audio_device", |
| 459 "../modules/audio_processing:audio_processing", | |
| 460 "../modules/video_coding:video_coding_utility", | |
| 461 "../modules/video_coding:webrtc_vp8", | 469 "../modules/video_coding:webrtc_vp8", |
| 462 "../p2p:p2p_test_utils", | 470 "../p2p:p2p_test_utils", |
| 463 "../system_wrappers:metrics_default", | 471 "../system_wrappers:metrics_default", |
| 464 "../test:audio_codec_mocks", | 472 "../test:audio_codec_mocks", |
| 465 "../test:test_support", | 473 "../test:test_support", |
| 466 "../voice_engine:voice_engine", | 474 "../voice_engine:voice_engine", |
| 467 ] | 475 ] |
| 476 | |
| 477 if (rtc_enable_media) { | |
| 478 deps += [ | |
| 479 "../api:video_frame_api", | |
| 480 "../api/audio_codecs:builtin_audio_decoder_factory", | |
| 481 "../api/audio_codecs:builtin_audio_encoder_factory", | |
| 482 "../common_video:common_video", | |
| 483 "../modules/audio_processing:audio_processing", | |
| 484 "../modules/video_coding:video_coding_utility", | |
| 485 ] | |
| 486 } | |
| 468 } | 487 } |
| 469 } | 488 } |
| OLD | NEW |