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 14 matching lines...) Expand all Loading... | |
25 | 25 |
26 config("rtc_media_warnings_config") { | 26 config("rtc_media_warnings_config") { |
27 # GN orders flags on a target before flags from configs. The default config | 27 # GN orders flags on a target before flags from configs. The default config |
28 # adds these flags so to cancel them out they need to come from a config and | 28 # adds these flags so to cancel them out they need to come from a config and |
29 # cannot be on the target directly. | 29 # cannot be on the target directly. |
30 if (!is_win) { | 30 if (!is_win) { |
31 cflags = [ "-Wno-deprecated-declarations" ] | 31 cflags = [ "-Wno-deprecated-declarations" ] |
32 } | 32 } |
33 } | 33 } |
34 | 34 |
35 rtc_static_library("rtc_media_base") { | 35 rtc_source_set("rtc_media_audio_base") { |
36 deps = [ | |
37 "../api/audio_codecs:audio_codecs_api", | |
38 ] | |
39 } | |
40 | |
41 rtc_source_set("rtc_media_video_base") { | |
42 deps = [ | |
43 "../api:video_frame_api", | |
44 "../common_video:common_video", | |
45 ] | |
46 } | |
47 | |
48 rtc_source_set("rtc_media_data_base") { | |
the sun
2017/05/29 13:55:32
"..._data_base" sounds like "database" was misspel
Zhi Huang
2017/05/31 00:03:28
Done.
| |
36 # TODO(kjellander): Remove (bugs.webrtc.org/6828) | 49 # TODO(kjellander): Remove (bugs.webrtc.org/6828) |
37 # Enabling GN check triggers cyclic dependency error: | 50 # Enabling GN check triggers cyclic dependency error: |
38 # //webrtc/media:rtc_media_base -> | 51 # //webrtc/media:rtc_media_base -> |
39 # //webrtc/pc:rtc_pc -> | 52 # //webrtc/pc:rtc_pc -> |
40 # //webrtc/media:media -> | 53 # //webrtc/media:media -> |
41 # //webrtc/media:rtc_media_base | 54 # //webrtc/media:rtc_media_base |
42 check_includes = false | 55 check_includes = false |
43 defines = [] | 56 defines = [] |
44 libs = [] | 57 libs = [] |
45 deps = [] | 58 deps = [] |
46 sources = [ | 59 sources = [ |
47 "base/adaptedvideotracksource.cc", | 60 "base/adaptedvideotracksource.cc", |
48 "base/adaptedvideotracksource.h", | 61 "base/adaptedvideotracksource.h", |
49 "base/audiosource.h", | 62 "base/audiosource.h", |
50 "base/codec.cc", | 63 "base/codec.cc", |
51 "base/codec.h", | 64 "base/codec.h", |
52 "base/cryptoparams.h", | 65 "base/cryptoparams.h", |
53 "base/device.h", | 66 "base/device.h", |
67 "base/h264_profile_level_id.cc", | |
68 "base/h264_profile_level_id.h", | |
54 "base/mediachannel.h", | 69 "base/mediachannel.h", |
55 "base/mediaconstants.cc", | 70 "base/mediaconstants.cc", |
56 "base/mediaconstants.h", | 71 "base/mediaconstants.h", |
57 "base/mediaengine.cc", | 72 "base/mediaengine.cc", |
58 "base/mediaengine.h", | 73 "base/mediaengine.h", |
59 "base/rtpdataengine.cc", | 74 "base/rtpdataengine.cc", |
60 "base/rtpdataengine.h", | 75 "base/rtpdataengine.h", |
61 "base/rtputils.cc", | 76 "base/rtputils.cc", |
62 "base/rtputils.h", | 77 "base/rtputils.h", |
63 "base/streamparams.cc", | 78 "base/streamparams.cc", |
64 "base/streamparams.h", | 79 "base/streamparams.h", |
65 "base/turnutils.cc", | 80 "base/turnutils.cc", |
66 "base/turnutils.h", | 81 "base/turnutils.h", |
67 "base/videoadapter.cc", | 82 "base/videoadapter.cc", |
the sun
2017/05/29 13:55:32
The fact that there are things here in the "data"
Zhi Huang
2017/05/31 00:03:28
Agreed. I'll leave a comment and a TODO here for n
| |
68 "base/videoadapter.h", | 83 "base/videoadapter.h", |
69 "base/videobroadcaster.cc", | 84 "base/videobroadcaster.cc", |
70 "base/videobroadcaster.h", | 85 "base/videobroadcaster.h", |
71 "base/videocapturer.cc", | 86 "base/videocapturer.cc", |
72 "base/videocapturer.h", | 87 "base/videocapturer.h", |
73 "base/videocapturerfactory.h", | 88 "base/videocapturerfactory.h", |
74 "base/videocommon.cc", | 89 "base/videocommon.cc", |
75 "base/videocommon.h", | 90 "base/videocommon.h", |
76 "base/videosourcebase.cc", | 91 "base/videosourcebase.cc", |
77 "base/videosourcebase.h", | 92 "base/videosourcebase.h", |
(...skipping 13 matching lines...) Expand all Loading... | |
91 "$rtc_libyuv_dir", | 106 "$rtc_libyuv_dir", |
92 ] | 107 ] |
93 } else { | 108 } else { |
94 # Need to add a directory normally exported by libyuv. | 109 # Need to add a directory normally exported by libyuv. |
95 include_dirs += [ "$rtc_libyuv_dir/include" ] | 110 include_dirs += [ "$rtc_libyuv_dir/include" ] |
96 } | 111 } |
97 | 112 |
98 deps += [ | 113 deps += [ |
99 "..:webrtc_common", | 114 "..:webrtc_common", |
100 "../api:libjingle_peerconnection_api", | 115 "../api:libjingle_peerconnection_api", |
101 "../api:video_frame_api", | |
102 "../api/audio_codecs:audio_codecs_api", | |
103 "../api/audio_codecs:builtin_audio_encoder_factory", | |
104 "../base:rtc_base", | 116 "../base:rtc_base", |
105 "../base:rtc_base_approved", | 117 "../base:rtc_base_approved", |
106 "../call:call_interfaces", | 118 "../call:call_interfaces", |
107 "../common_video:common_video", | |
108 "../p2p", | 119 "../p2p", |
109 ] | 120 ] |
110 | 121 |
111 if (is_nacl) { | 122 if (is_nacl) { |
112 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] | 123 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] |
113 } | 124 } |
114 } | 125 } |
115 | 126 |
116 rtc_static_library("rtc_media") { | 127 rtc_static_library("rtc_media_base") { |
128 public_deps = [ | |
129 ":rtc_media_audio_base", | |
130 ":rtc_media_data_base", | |
131 ":rtc_media_video_base", | |
132 ] | |
133 } | |
134 | |
135 rtc_static_library("rtc_audio_video") { | |
117 # TODO(kjellander): Remove (bugs.webrtc.org/6828) | 136 # TODO(kjellander): Remove (bugs.webrtc.org/6828) |
118 # Enabling GN check triggers cyclic dependency error: | 137 # Enabling GN check triggers cyclic dependency error: |
119 # //webrtc/media:media -> | 138 # //webrtc/media:media -> |
120 # //webrtc/media:rtc_media -> | 139 # //webrtc/media:rtc_media -> |
121 # //webrtc/pc:rtc_pc -> | 140 # //webrtc/pc:rtc_pc -> |
122 # //webrtc/media:media | 141 # //webrtc/media:media |
123 check_includes = false | 142 check_includes = false |
kjellander_webrtc
2017/06/01 05:34:30
yay! less cycles. Thanks for that.
| |
124 defines = [] | 143 defines = [] |
125 libs = [] | 144 libs = [] |
126 deps = [] | 145 deps = [] |
127 sources = [ | 146 sources = [ |
128 "engine/adm_helpers.cc", | 147 "engine/adm_helpers.cc", |
129 "engine/adm_helpers.h", | 148 "engine/adm_helpers.h", |
130 "engine/apm_helpers.cc", | 149 "engine/apm_helpers.cc", |
131 "engine/apm_helpers.h", | 150 "engine/apm_helpers.h", |
132 "engine/internaldecoderfactory.cc", | 151 "engine/internaldecoderfactory.cc", |
133 "engine/internaldecoderfactory.h", | 152 "engine/internaldecoderfactory.h", |
(...skipping 15 matching lines...) Expand all Loading... | |
149 "engine/webrtcvideocapturer.h", | 168 "engine/webrtcvideocapturer.h", |
150 "engine/webrtcvideocapturerfactory.cc", | 169 "engine/webrtcvideocapturerfactory.cc", |
151 "engine/webrtcvideocapturerfactory.h", | 170 "engine/webrtcvideocapturerfactory.h", |
152 "engine/webrtcvideodecoderfactory.h", | 171 "engine/webrtcvideodecoderfactory.h", |
153 "engine/webrtcvideoencoderfactory.h", | 172 "engine/webrtcvideoencoderfactory.h", |
154 "engine/webrtcvideoengine2.cc", | 173 "engine/webrtcvideoengine2.cc", |
155 "engine/webrtcvideoengine2.h", | 174 "engine/webrtcvideoengine2.h", |
156 "engine/webrtcvoe.h", | 175 "engine/webrtcvoe.h", |
157 "engine/webrtcvoiceengine.cc", | 176 "engine/webrtcvoiceengine.cc", |
158 "engine/webrtcvoiceengine.h", | 177 "engine/webrtcvoiceengine.h", |
159 "sctp/sctptransportinternal.h", | |
160 ] | 178 ] |
161 | 179 |
162 if (rtc_enable_sctp) { | |
163 sources += [ | |
164 "sctp/sctptransport.cc", | |
165 "sctp/sctptransport.h", | |
166 ] | |
167 } | |
168 | |
169 configs += [ ":rtc_media_warnings_config" ] | 180 configs += [ ":rtc_media_warnings_config" ] |
170 | 181 |
171 if (!build_with_chromium && is_clang) { | 182 if (!build_with_chromium && is_clang) { |
172 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 183 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
173 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 184 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
174 } | 185 } |
175 | 186 |
176 if (is_win) { | 187 if (is_win) { |
177 cflags = [ | 188 cflags = [ |
178 "/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatch. | 189 "/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatch. |
(...skipping 18 matching lines...) Expand all Loading... | |
197 if (rtc_build_libyuv) { | 208 if (rtc_build_libyuv) { |
198 deps += [ "$rtc_libyuv_dir" ] | 209 deps += [ "$rtc_libyuv_dir" ] |
199 public_deps = [ | 210 public_deps = [ |
200 "$rtc_libyuv_dir", | 211 "$rtc_libyuv_dir", |
201 ] | 212 ] |
202 } else { | 213 } else { |
203 # Need to add a directory normally exported by libyuv. | 214 # Need to add a directory normally exported by libyuv. |
204 include_dirs += [ "$rtc_libyuv_dir/include" ] | 215 include_dirs += [ "$rtc_libyuv_dir/include" ] |
205 } | 216 } |
206 | 217 |
207 if (rtc_enable_sctp && rtc_build_usrsctp) { | |
208 include_dirs += [ | |
209 # TODO(jiayl): move this into the public_configs of | |
210 # //third_party/usrsctp/BUILD.gn. | |
211 "//third_party/usrsctp/usrsctplib", | |
212 ] | |
213 deps += [ "//third_party/usrsctp" ] | |
214 } | |
215 | |
216 public_configs = [] | 218 public_configs = [] |
217 if (build_with_chromium) { | 219 if (build_with_chromium) { |
218 deps += [ "../modules/video_capture:video_capture" ] | 220 deps += [ "../modules/video_capture:video_capture" ] |
219 } else { | 221 } else { |
220 public_configs += [ ":rtc_media_defines_config" ] | 222 public_configs += [ ":rtc_media_defines_config" ] |
221 deps += [ "../modules/video_capture:video_capture_internal_impl" ] | 223 deps += [ "../modules/video_capture:video_capture_internal_impl" ] |
222 } | 224 } |
223 deps += [ | 225 deps += [ |
224 ":rtc_media_base", | 226 ":rtc_media_audio_base", |
227 ":rtc_media_data_base", | |
228 ":rtc_media_video_base", | |
225 "..:webrtc_common", | 229 "..:webrtc_common", |
226 "../api:call_api", | 230 "../api:call_api", |
227 "../api:transport_api", | 231 "../api:transport_api", |
228 "../api:video_frame_api", | 232 "../api:video_frame_api", |
229 "../api/audio_codecs:audio_codecs_api", | 233 "../api/audio_codecs:audio_codecs_api", |
230 "../api/audio_codecs:builtin_audio_decoder_factory", | 234 "../api/audio_codecs:builtin_audio_decoder_factory", |
231 "../api/video_codecs:video_codecs_api", | 235 "../api/video_codecs:video_codecs_api", |
232 "../base:rtc_base", | 236 "../base:rtc_base", |
233 "../base:rtc_base_approved", | 237 "../base:rtc_base_approved", |
234 "../call", | 238 "../call", |
235 "../common_video:common_video", | 239 "../common_video:common_video", |
236 "../modules/audio_coding:rent_a_codec", | 240 "../modules/audio_coding:rent_a_codec", |
237 "../modules/audio_device:audio_device", | 241 "../modules/audio_device:audio_device", |
238 "../modules/audio_mixer:audio_mixer_impl", | 242 "../modules/audio_mixer:audio_mixer_impl", |
239 "../modules/audio_processing:audio_processing", | 243 "../modules/audio_processing:audio_processing", |
240 "../modules/video_capture:video_capture_module", | 244 "../modules/video_capture:video_capture_module", |
241 "../modules/video_coding", | 245 "../modules/video_coding", |
242 "../modules/video_coding:webrtc_h264", | 246 "../modules/video_coding:webrtc_h264", |
243 "../modules/video_coding:webrtc_vp8", | 247 "../modules/video_coding:webrtc_vp8", |
244 "../modules/video_coding:webrtc_vp9", | 248 "../modules/video_coding:webrtc_vp9", |
245 "../p2p:rtc_p2p", | 249 "../p2p:rtc_p2p", |
246 "../system_wrappers", | 250 "../system_wrappers", |
247 "../video", | 251 "../video", |
248 "../voice_engine", | 252 "../voice_engine", |
249 ] | 253 ] |
250 } | 254 } |
251 | 255 |
256 rtc_static_library("rtc_data") { | |
257 # TODO(kjellander): Remove (bugs.webrtc.org/6828) | |
258 # Enabling GN check triggers cyclic dependency error: | |
kjellander_webrtc
2017/05/29 20:59:15
Is this comment still correct? I suspect you'll ge
Zhi Huang
2017/05/31 00:03:28
We can enable the check here. The circular depende
kjellander_webrtc
2017/06/01 05:34:30
Awesome.
| |
259 # //webrtc/media:media -> | |
260 # //webrtc/media:rtc_media -> | |
261 # //webrtc/pc:rtc_pc -> | |
262 # //webrtc/media:media | |
263 check_includes = false | |
264 defines = [] | |
265 deps = [] | |
266 | |
267 if (rtc_enable_sctp) { | |
268 sources = [ | |
269 "sctp/sctptransport.cc", | |
270 "sctp/sctptransport.h", | |
271 "sctp/sctptransportinternal.h", | |
272 ] | |
273 } | |
274 | |
275 configs += [ ":rtc_media_warnings_config" ] | |
276 | |
277 if (!build_with_chromium && is_clang) { | |
278 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | |
279 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | |
280 } | |
281 | |
282 if (is_win) { | |
283 cflags = [ | |
284 "/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatch. | |
285 "/wd4267", # conversion from "size_t" to "int", possible loss of data. | |
286 "/wd4389", # signed/unsigned mismatch. | |
287 ] | |
288 } | |
289 | |
290 if (rtc_enable_sctp && rtc_build_usrsctp) { | |
291 include_dirs = [ | |
292 # TODO(jiayl): move this into the public_configs of | |
293 # //third_party/usrsctp/BUILD.gn. | |
294 "//third_party/usrsctp/usrsctplib", | |
295 ] | |
296 deps += [ "//third_party/usrsctp" ] | |
297 } | |
298 | |
299 deps += [ | |
300 ":rtc_media_data_base", | |
301 "..:webrtc_common", | |
302 "../api:call_api", | |
303 "../api:transport_api", | |
304 "../base:rtc_base", | |
305 "../base:rtc_base_approved", | |
306 "../p2p:rtc_p2p", | |
307 "../system_wrappers", | |
308 ] | |
309 } | |
310 | |
311 rtc_static_library("rtc_media") { | |
312 # TODO(kjellander): Remove (bugs.webrtc.org/6828) | |
313 # Enabling GN check triggers cyclic dependency error: | |
kjellander_webrtc
2017/05/29 20:59:15
Is this comment still correct? I suspect you'll ge
Zhi Huang
2017/05/31 00:03:28
We can enable the check here. The circular depende
| |
314 # //webrtc/media:media -> | |
315 # //webrtc/media:rtc_media -> | |
316 # //webrtc/pc:rtc_pc -> | |
317 # //webrtc/media:media | |
318 check_includes = false | |
319 public_deps = [ | |
320 ":rtc_audio_video", | |
321 ":rtc_data", | |
322 ] | |
323 } | |
324 | |
252 if (rtc_include_tests) { | 325 if (rtc_include_tests) { |
253 config("rtc_unittest_main_config") { | 326 config("rtc_unittest_main_config") { |
254 # GN orders flags on a target before flags from configs. The default config | 327 # GN orders flags on a target before flags from configs. The default config |
255 # adds -Wall, and this flag have to be after -Wall -- so they need to | 328 # adds -Wall, and this flag have to be after -Wall -- so they need to |
256 # come from a config and can"t be on the target directly. | 329 # come from a config and can"t be on the target directly. |
257 if (is_clang && is_ios) { | 330 if (is_clang && is_ios) { |
258 cflags = [ "-Wno-unused-variable" ] | 331 cflags = [ "-Wno-unused-variable" ] |
259 } | 332 } |
260 } | 333 } |
261 | 334 |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
457 "../modules/video_coding:video_coding_utility", | 530 "../modules/video_coding:video_coding_utility", |
458 "../modules/video_coding:webrtc_vp8", | 531 "../modules/video_coding:webrtc_vp8", |
459 "../p2p:p2p_test_utils", | 532 "../p2p:p2p_test_utils", |
460 "../system_wrappers:metrics_default", | 533 "../system_wrappers:metrics_default", |
461 "../test:audio_codec_mocks", | 534 "../test:audio_codec_mocks", |
462 "../test:test_support", | 535 "../test:test_support", |
463 "../voice_engine:voice_engine", | 536 "../voice_engine:voice_engine", |
464 ] | 537 ] |
465 } | 538 } |
466 } | 539 } |
OLD | NEW |