Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: webrtc/pc/channelmanager.h

Issue 2539813003: Set the preferred DSCP value for Rtp data channel to be DSCP_AF41. (Closed)
Patch Set: Passing the MediaConfig. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // associated with the specified session. 101 // associated with the specified session.
102 VideoChannel* CreateVideoChannel( 102 VideoChannel* CreateVideoChannel(
103 webrtc::MediaControllerInterface* media_controller, 103 webrtc::MediaControllerInterface* media_controller,
104 TransportController* transport_controller, 104 TransportController* transport_controller,
105 const std::string& content_name, 105 const std::string& content_name,
106 const std::string* bundle_transport_name, 106 const std::string* bundle_transport_name,
107 bool rtcp, 107 bool rtcp,
108 const VideoOptions& options); 108 const VideoOptions& options);
109 // Destroys a video channel created with the Create API. 109 // Destroys a video channel created with the Create API.
110 void DestroyVideoChannel(VideoChannel* video_channel); 110 void DestroyVideoChannel(VideoChannel* video_channel);
111 DataChannel* CreateDataChannel(TransportController* transport_controller, 111 DataChannel* CreateDataChannel(
112 const std::string& content_name, 112 TransportController* transport_controller,
113 const std::string* bundle_transport_name, 113 const std::string& content_name,
114 bool rtcp, 114 const std::string* bundle_transport_name,
115 DataChannelType data_channel_type); 115 bool rtcp,
116 DataChannelType data_channel_type,
117 webrtc::MediaControllerInterface* media_controller = nullptr);
116 // Destroys a data channel created with the Create API. 118 // Destroys a data channel created with the Create API.
117 void DestroyDataChannel(DataChannel* data_channel); 119 void DestroyDataChannel(DataChannel* data_channel);
118 120
119 // Indicates whether any channels exist. 121 // Indicates whether any channels exist.
120 bool has_channels() const { 122 bool has_channels() const {
121 return (!voice_channels_.empty() || !video_channels_.empty()); 123 return (!voice_channels_.empty() || !video_channels_.empty());
122 } 124 }
123 125
124 // RTX will be enabled/disabled in engines that support it. The supporting 126 // RTX will be enabled/disabled in engines that support it. The supporting
125 // engines will start offering an RTX codec. Must be called before Init(). 127 // engines will start offering an RTX codec. Must be called before Init().
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 const AudioOptions& options); 166 const AudioOptions& options);
165 void DestroyVoiceChannel_w(VoiceChannel* voice_channel); 167 void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
166 VideoChannel* CreateVideoChannel_w( 168 VideoChannel* CreateVideoChannel_w(
167 webrtc::MediaControllerInterface* media_controller, 169 webrtc::MediaControllerInterface* media_controller,
168 TransportController* transport_controller, 170 TransportController* transport_controller,
169 const std::string& content_name, 171 const std::string& content_name,
170 const std::string* bundle_transport_name, 172 const std::string* bundle_transport_name,
171 bool rtcp, 173 bool rtcp,
172 const VideoOptions& options); 174 const VideoOptions& options);
173 void DestroyVideoChannel_w(VideoChannel* video_channel); 175 void DestroyVideoChannel_w(VideoChannel* video_channel);
174 DataChannel* CreateDataChannel_w(TransportController* transport_controller, 176 DataChannel* CreateDataChannel_w(
175 const std::string& content_name, 177 TransportController* transport_controller,
176 const std::string* bundle_transport_name, 178 const std::string& content_name,
177 bool rtcp, 179 const std::string* bundle_transport_name,
178 DataChannelType data_channel_type); 180 bool rtcp,
181 DataChannelType data_channel_type,
182 webrtc::MediaControllerInterface* media_controller);
179 void DestroyDataChannel_w(DataChannel* data_channel); 183 void DestroyDataChannel_w(DataChannel* data_channel);
180 184
181 std::unique_ptr<MediaEngineInterface> media_engine_; 185 std::unique_ptr<MediaEngineInterface> media_engine_;
182 std::unique_ptr<DataEngineInterface> data_media_engine_; 186 std::unique_ptr<DataEngineInterface> data_media_engine_;
183 bool initialized_; 187 bool initialized_;
184 rtc::Thread* main_thread_; 188 rtc::Thread* main_thread_;
185 rtc::Thread* worker_thread_; 189 rtc::Thread* worker_thread_;
186 rtc::Thread* network_thread_; 190 rtc::Thread* network_thread_;
187 191
188 VoiceChannels voice_channels_; 192 VoiceChannels voice_channels_;
189 VideoChannels video_channels_; 193 VideoChannels video_channels_;
190 DataChannels data_channels_; 194 DataChannels data_channels_;
191 195
192 bool enable_rtx_; 196 bool enable_rtx_;
193 rtc::CryptoOptions crypto_options_; 197 rtc::CryptoOptions crypto_options_;
194 198
195 bool capturing_; 199 bool capturing_;
196 }; 200 };
197 201
198 } // namespace cricket 202 } // namespace cricket
199 203
200 #endif // WEBRTC_PC_CHANNELMANAGER_H_ 204 #endif // WEBRTC_PC_CHANNELMANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698