Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2015 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("../webrtc.gni") | 9 import("../webrtc.gni") |
| 10 | 10 |
| 11 rtc_source_set("call_interfaces") { | 11 rtc_source_set("call_interfaces") { |
| 12 sources = [ | 12 sources = [ |
| 13 "audio_receive_stream.h", | 13 "audio_receive_stream.h", |
| 14 "audio_send_stream.cc", | 14 "audio_send_stream.cc", |
| 15 "audio_send_stream.h", | 15 "audio_send_stream.h", |
| 16 "audio_state.h", | 16 "audio_state.h", |
| 17 "call.h", | 17 "call.h", |
| 18 "flexfec_receive_stream.h", | 18 "flexfec_receive_stream.h", |
| 19 "rtp_demuxer.h", | |
| 20 "rtp_transport_controller_send_interface.h", | |
| 21 "syncable.cc", | 19 "syncable.cc", |
| 22 "syncable.h", | 20 "syncable.h", |
| 23 ] | 21 ] |
| 24 deps = [ | 22 deps = [ |
| 23 ":rtp_interfaces", | |
| 25 "..:video_stream_api", | 24 "..:video_stream_api", |
| 26 "..:webrtc_common", | 25 "..:webrtc_common", |
| 27 "../api:audio_mixer_api", | 26 "../api:audio_mixer_api", |
| 28 "../api:libjingle_peerconnection_api", | 27 "../api:libjingle_peerconnection_api", |
| 29 "../api:transport_api", | 28 "../api:transport_api", |
| 30 "../api/audio_codecs:audio_codecs_api", | 29 "../api/audio_codecs:audio_codecs_api", |
| 31 "../base:rtc_base", | 30 "../base:rtc_base", |
| 32 "../base:rtc_base_approved", | 31 "../base:rtc_base_approved", |
| 33 ] | 32 ] |
| 34 } | 33 } |
| 35 | 34 |
| 35 # TODO(nisse): These RTP targets should be moved elsewhere | |
| 36 # when interfaces have stabilized. | |
| 37 rtc_source_set("rtp_interfaces") { | |
| 38 sources = [ | |
| 39 "rtp_demuxer.h", | |
| 40 "rtp_transport_controller_send_interface.h", | |
| 41 ] | |
| 42 } | |
| 43 | |
| 44 rtc_source_set("rtp_receiver") { | |
| 45 sources = [ | |
| 46 "rtp_demuxer.cc", | |
|
the sun
2017/05/31 13:06:29
It seems rtp_demuxer should be split so that the c
nisse-webrtc
2017/05/31 13:16:50
Ok, so I'd split out the RtpPacketSinkInterface to
| |
| 47 "rtp_demuxer.h", | |
| 48 "rtx_receive_stream.cc", | |
| 49 "rtx_receive_stream.h", | |
| 50 ] | |
| 51 deps = [ | |
| 52 ":rtp_interfaces", | |
|
danilchap
2017/05/31 11:56:59
is this dependency needed?
nisse-webrtc
2017/05/31 12:01:09
It looks like rtp_demuxer.h was accidentally liste
| |
| 53 "../base:rtc_base_approved", | |
| 54 "../modules/rtp_rtcp", | |
| 55 ] | |
| 56 } | |
| 57 | |
| 58 rtc_source_set("rtp_sender") { | |
| 59 sources = [ | |
| 60 "rtp_transport_controller_send.cc", | |
| 61 "rtp_transport_controller_send.h", | |
| 62 ] | |
| 63 deps = [ | |
| 64 ":rtp_interfaces", | |
| 65 "../base:rtc_base_approved", | |
| 66 "../modules/congestion_controller", | |
| 67 ] | |
| 68 } | |
| 69 | |
| 36 rtc_static_library("call") { | 70 rtc_static_library("call") { |
| 37 sources = [ | 71 sources = [ |
| 38 "bitrate_allocator.cc", | 72 "bitrate_allocator.cc", |
| 39 "call.cc", | 73 "call.cc", |
| 40 "flexfec_receive_stream_impl.cc", | 74 "flexfec_receive_stream_impl.cc", |
| 41 "flexfec_receive_stream_impl.h", | 75 "flexfec_receive_stream_impl.h", |
| 42 "rtp_demuxer.cc", | |
| 43 "rtp_transport_controller_send.cc", | |
| 44 "rtp_transport_controller_send.h", | |
| 45 "rtx_receive_stream.cc", | |
| 46 "rtx_receive_stream.h", | |
| 47 ] | 76 ] |
| 48 | 77 |
| 49 if (!build_with_chromium && is_clang) { | 78 if (!build_with_chromium && is_clang) { |
| 50 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 79 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 51 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 80 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 52 } | 81 } |
| 53 | 82 |
| 54 public_deps = [ | 83 public_deps = [ |
| 55 ":call_interfaces", | 84 ":call_interfaces", |
| 56 "../api:call_api", | 85 "../api:call_api", |
| 57 ] | 86 ] |
| 58 | 87 |
| 59 deps = [ | 88 deps = [ |
| 60 ":call_interfaces", | 89 ":call_interfaces", |
| 90 ":rtp_interfaces", | |
| 91 ":rtp_receiver", | |
| 92 ":rtp_sender", | |
| 61 "..:webrtc_common", | 93 "..:webrtc_common", |
| 62 "../api:transport_api", | 94 "../api:transport_api", |
| 63 "../audio", | 95 "../audio", |
| 64 "../base:rtc_task_queue", | 96 "../base:rtc_task_queue", |
| 65 "../logging:rtc_event_log_api", | 97 "../logging:rtc_event_log_api", |
| 66 "../logging:rtc_event_log_impl", | 98 "../logging:rtc_event_log_impl", |
| 67 "../modules/bitrate_controller", | 99 "../modules/bitrate_controller", |
| 68 "../modules/congestion_controller", | 100 "../modules/congestion_controller", |
| 69 "../modules/pacing", | 101 "../modules/pacing", |
| 70 "../modules/rtp_rtcp", | 102 "../modules/rtp_rtcp", |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 86 } | 118 } |
| 87 sources = [ | 119 sources = [ |
| 88 "bitrate_allocator_unittest.cc", | 120 "bitrate_allocator_unittest.cc", |
| 89 "bitrate_estimator_tests.cc", | 121 "bitrate_estimator_tests.cc", |
| 90 "call_unittest.cc", | 122 "call_unittest.cc", |
| 91 "flexfec_receive_stream_unittest.cc", | 123 "flexfec_receive_stream_unittest.cc", |
| 92 "rtx_receive_stream_unittest.cc", | 124 "rtx_receive_stream_unittest.cc", |
| 93 ] | 125 ] |
| 94 deps = [ | 126 deps = [ |
| 95 ":call", | 127 ":call", |
| 128 ":rtp_interfaces", | |
| 129 ":rtp_receiver", | |
| 130 ":rtp_sender", | |
| 96 "../api:mock_audio_mixer", | 131 "../api:mock_audio_mixer", |
| 97 "../base:rtc_base_approved", | 132 "../base:rtc_base_approved", |
| 98 "../logging:rtc_event_log_api", | 133 "../logging:rtc_event_log_api", |
| 99 "../modules/audio_device:mock_audio_device", | 134 "../modules/audio_device:mock_audio_device", |
| 100 "../modules/audio_mixer", | 135 "../modules/audio_mixer", |
| 101 "../modules/bitrate_controller", | 136 "../modules/bitrate_controller", |
| 102 "../modules/congestion_controller:mock_congestion_controller", | 137 "../modules/congestion_controller:mock_congestion_controller", |
| 103 "../modules/pacing", | 138 "../modules/pacing", |
| 104 "../modules/rtp_rtcp", | 139 "../modules/rtp_rtcp", |
| 105 "../modules/rtp_rtcp:mock_rtp_rtcp", | 140 "../modules/rtp_rtcp:mock_rtp_rtcp", |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 152 "//testing/gtest", | 187 "//testing/gtest", |
| 153 "//webrtc/test:field_trial", | 188 "//webrtc/test:field_trial", |
| 154 "//webrtc/test:test_common", | 189 "//webrtc/test:test_common", |
| 155 ] | 190 ] |
| 156 if (!build_with_chromium && is_clang) { | 191 if (!build_with_chromium && is_clang) { |
| 157 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 192 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 158 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 193 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 159 } | 194 } |
| 160 } | 195 } |
| 161 } | 196 } |
| OLD | NEW |