Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 87 void Terminate(); | 87 void Terminate(); |
| 88 | 88 |
| 89 // The operations below all occur on the worker thread. | 89 // The operations below all occur on the worker thread. |
| 90 // Creates a voice channel, to be associated with the specified session. | 90 // Creates a voice channel, to be associated with the specified session. |
| 91 VoiceChannel* CreateVoiceChannel( | 91 VoiceChannel* CreateVoiceChannel( |
| 92 webrtc::MediaControllerInterface* media_controller, | 92 webrtc::MediaControllerInterface* media_controller, |
| 93 TransportController* transport_controller, | 93 TransportController* transport_controller, |
| 94 const std::string& content_name, | 94 const std::string& content_name, |
| 95 const std::string* bundle_transport_name, | 95 const std::string* bundle_transport_name, |
| 96 bool rtcp, | 96 bool rtcp, |
| 97 bool secure_required, | |
| 97 const AudioOptions& options); | 98 const AudioOptions& options); |
| 98 // Destroys a voice channel created with the Create API. | 99 // Destroys a voice channel created with the Create API. |
| 99 void DestroyVoiceChannel(VoiceChannel* voice_channel); | 100 void DestroyVoiceChannel(VoiceChannel* voice_channel); |
| 100 // Creates a video channel, synced with the specified voice channel, and | 101 // Creates a video channel, synced with the specified voice channel, and |
| 101 // associated with the specified session. | 102 // associated with the specified session. |
| 102 VideoChannel* CreateVideoChannel( | 103 VideoChannel* CreateVideoChannel( |
| 103 webrtc::MediaControllerInterface* media_controller, | 104 webrtc::MediaControllerInterface* media_controller, |
| 104 TransportController* transport_controller, | 105 TransportController* transport_controller, |
| 105 const std::string& content_name, | 106 const std::string& content_name, |
| 106 const std::string* bundle_transport_name, | 107 const std::string* bundle_transport_name, |
| 107 bool rtcp, | 108 bool rtcp, |
| 109 bool secure_required, | |
| 108 const VideoOptions& options); | 110 const VideoOptions& options); |
| 109 // Destroys a video channel created with the Create API. | 111 // Destroys a video channel created with the Create API. |
| 110 void DestroyVideoChannel(VideoChannel* video_channel); | 112 void DestroyVideoChannel(VideoChannel* video_channel); |
| 111 DataChannel* CreateDataChannel(TransportController* transport_controller, | 113 DataChannel* CreateDataChannel(TransportController* transport_controller, |
| 112 const std::string& content_name, | 114 const std::string& content_name, |
| 113 const std::string* bundle_transport_name, | 115 const std::string* bundle_transport_name, |
| 114 bool rtcp, | 116 bool rtcp, |
| 117 bool secure_required, | |
| 115 DataChannelType data_channel_type); | 118 DataChannelType data_channel_type); |
| 116 // Destroys a data channel created with the Create API. | 119 // Destroys a data channel created with the Create API. |
| 117 void DestroyDataChannel(DataChannel* data_channel); | 120 void DestroyDataChannel(DataChannel* data_channel); |
| 118 | 121 |
| 119 // Indicates whether any channels exist. | 122 // Indicates whether any channels exist. |
| 120 bool has_channels() const { | 123 bool has_channels() const { |
| 121 return (!voice_channels_.empty() || !video_channels_.empty()); | 124 return (!voice_channels_.empty() || !video_channels_.empty()); |
| 122 } | 125 } |
| 123 | 126 |
| 124 // RTX will be enabled/disabled in engines that support it. The supporting | 127 // RTX will be enabled/disabled in engines that support it. The supporting |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 154 bool InitMediaEngine_w(); | 157 bool InitMediaEngine_w(); |
| 155 void DestructorDeletes_w(); | 158 void DestructorDeletes_w(); |
| 156 void Terminate_w(); | 159 void Terminate_w(); |
| 157 bool SetCryptoOptions_w(const rtc::CryptoOptions& crypto_options); | 160 bool SetCryptoOptions_w(const rtc::CryptoOptions& crypto_options); |
| 158 VoiceChannel* CreateVoiceChannel_w( | 161 VoiceChannel* CreateVoiceChannel_w( |
| 159 webrtc::MediaControllerInterface* media_controller, | 162 webrtc::MediaControllerInterface* media_controller, |
| 160 TransportController* transport_controller, | 163 TransportController* transport_controller, |
| 161 const std::string& content_name, | 164 const std::string& content_name, |
| 162 const std::string* bundle_transport_name, | 165 const std::string* bundle_transport_name, |
| 163 bool rtcp, | 166 bool rtcp, |
| 167 bool secure_required, | |
| 164 const AudioOptions& options); | 168 const AudioOptions& options); |
| 165 void DestroyVoiceChannel_w(VoiceChannel* voice_channel); | 169 void DestroyVoiceChannel_w(VoiceChannel* voice_channel); |
| 166 VideoChannel* CreateVideoChannel_w( | 170 VideoChannel* CreateVideoChannel_w( |
| 167 webrtc::MediaControllerInterface* media_controller, | 171 webrtc::MediaControllerInterface* media_controller, |
| 168 TransportController* transport_controller, | 172 TransportController* transport_controller, |
| 169 const std::string& content_name, | 173 const std::string& content_name, |
| 170 const std::string* bundle_transport_name, | 174 const std::string* bundle_transport_name, |
| 171 bool rtcp, | 175 bool rtcp, |
| 176 bool secure_required, | |
| 172 const VideoOptions& options); | 177 const VideoOptions& options); |
| 173 void DestroyVideoChannel_w(VideoChannel* video_channel); | 178 void DestroyVideoChannel_w(VideoChannel* video_channel); |
| 174 DataChannel* CreateDataChannel_w(TransportController* transport_controller, | 179 DataChannel* CreateDataChannel_w(TransportController* transport_controller, |
| 175 const std::string& content_name, | 180 const std::string& content_name, |
| 176 const std::string* bundle_transport_name, | 181 const std::string* bundle_transport_name, |
| 177 bool rtcp, | 182 bool rtcp, |
| 183 bool secure_required, | |
| 178 DataChannelType data_channel_type); | 184 DataChannelType data_channel_type); |
|
pthatcher1
2016/11/30 19:16:17
Same here. We should be able to just assume this
Taylor Brandstetter
2016/12/01 02:41:34
I'm not sure what you're referring to when you say
| |
| 179 void DestroyDataChannel_w(DataChannel* data_channel); | 185 void DestroyDataChannel_w(DataChannel* data_channel); |
| 180 | 186 |
| 181 std::unique_ptr<MediaEngineInterface> media_engine_; | 187 std::unique_ptr<MediaEngineInterface> media_engine_; |
| 182 std::unique_ptr<DataEngineInterface> data_media_engine_; | 188 std::unique_ptr<DataEngineInterface> data_media_engine_; |
| 183 bool initialized_; | 189 bool initialized_; |
| 184 rtc::Thread* main_thread_; | 190 rtc::Thread* main_thread_; |
| 185 rtc::Thread* worker_thread_; | 191 rtc::Thread* worker_thread_; |
| 186 rtc::Thread* network_thread_; | 192 rtc::Thread* network_thread_; |
| 187 | 193 |
| 188 VoiceChannels voice_channels_; | 194 VoiceChannels voice_channels_; |
| 189 VideoChannels video_channels_; | 195 VideoChannels video_channels_; |
| 190 DataChannels data_channels_; | 196 DataChannels data_channels_; |
| 191 | 197 |
| 192 bool enable_rtx_; | 198 bool enable_rtx_; |
| 193 rtc::CryptoOptions crypto_options_; | 199 rtc::CryptoOptions crypto_options_; |
| 194 | 200 |
| 195 bool capturing_; | 201 bool capturing_; |
| 196 }; | 202 }; |
| 197 | 203 |
| 198 } // namespace cricket | 204 } // namespace cricket |
| 199 | 205 |
| 200 #endif // WEBRTC_PC_CHANNELMANAGER_H_ | 206 #endif // WEBRTC_PC_CHANNELMANAGER_H_ |
| OLD | NEW |