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

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: Remove the default parameter. 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
« no previous file with comments | « webrtc/media/sctp/sctpdataengine_unittest.cc ('k') | webrtc/pc/channelmanager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(TransportController* transport_controller,
112 const std::string& content_name, 112 const std::string& content_name,
113 const std::string* bundle_transport_name, 113 const std::string* bundle_transport_name,
114 bool rtcp, 114 bool rtcp,
115 DataChannelType data_channel_type); 115 DataChannelType data_channel_type);
116 DataChannel* CreateDataChannel(
117 TransportController* transport_controller,
118 webrtc::MediaControllerInterface* media_controller,
119 const std::string& content_name,
120 const std::string* bundle_transport_name,
121 bool rtcp,
122 DataChannelType data_channel_type);
116 // Destroys a data channel created with the Create API. 123 // Destroys a data channel created with the Create API.
117 void DestroyDataChannel(DataChannel* data_channel); 124 void DestroyDataChannel(DataChannel* data_channel);
118 125
119 // Indicates whether any channels exist. 126 // Indicates whether any channels exist.
120 bool has_channels() const { 127 bool has_channels() const {
121 return (!voice_channels_.empty() || !video_channels_.empty()); 128 return (!voice_channels_.empty() || !video_channels_.empty());
122 } 129 }
123 130
124 // RTX will be enabled/disabled in engines that support it. The supporting 131 // 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(). 132 // 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); 171 const AudioOptions& options);
165 void DestroyVoiceChannel_w(VoiceChannel* voice_channel); 172 void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
166 VideoChannel* CreateVideoChannel_w( 173 VideoChannel* CreateVideoChannel_w(
167 webrtc::MediaControllerInterface* media_controller, 174 webrtc::MediaControllerInterface* media_controller,
168 TransportController* transport_controller, 175 TransportController* transport_controller,
169 const std::string& content_name, 176 const std::string& content_name,
170 const std::string* bundle_transport_name, 177 const std::string* bundle_transport_name,
171 bool rtcp, 178 bool rtcp,
172 const VideoOptions& options); 179 const VideoOptions& options);
173 void DestroyVideoChannel_w(VideoChannel* video_channel); 180 void DestroyVideoChannel_w(VideoChannel* video_channel);
174 DataChannel* CreateDataChannel_w(TransportController* transport_controller, 181 DataChannel* CreateDataChannel_w(
175 const std::string& content_name, 182 TransportController* transport_controller,
176 const std::string* bundle_transport_name, 183 const std::string& content_name,
177 bool rtcp, 184 const std::string* bundle_transport_name,
178 DataChannelType data_channel_type); 185 bool rtcp,
186 DataChannelType data_channel_type,
187 webrtc::MediaControllerInterface* media_controller);
179 void DestroyDataChannel_w(DataChannel* data_channel); 188 void DestroyDataChannel_w(DataChannel* data_channel);
180 189
181 std::unique_ptr<MediaEngineInterface> media_engine_; 190 std::unique_ptr<MediaEngineInterface> media_engine_;
182 std::unique_ptr<DataEngineInterface> data_media_engine_; 191 std::unique_ptr<DataEngineInterface> data_media_engine_;
183 bool initialized_; 192 bool initialized_;
184 rtc::Thread* main_thread_; 193 rtc::Thread* main_thread_;
185 rtc::Thread* worker_thread_; 194 rtc::Thread* worker_thread_;
186 rtc::Thread* network_thread_; 195 rtc::Thread* network_thread_;
187 196
188 VoiceChannels voice_channels_; 197 VoiceChannels voice_channels_;
189 VideoChannels video_channels_; 198 VideoChannels video_channels_;
190 DataChannels data_channels_; 199 DataChannels data_channels_;
191 200
192 bool enable_rtx_; 201 bool enable_rtx_;
193 rtc::CryptoOptions crypto_options_; 202 rtc::CryptoOptions crypto_options_;
194 203
195 bool capturing_; 204 bool capturing_;
196 }; 205 };
197 206
198 } // namespace cricket 207 } // namespace cricket
199 208
200 #endif // WEBRTC_PC_CHANNELMANAGER_H_ 209 #endif // WEBRTC_PC_CHANNELMANAGER_H_
OLDNEW
« no previous file with comments | « webrtc/media/sctp/sctpdataengine_unittest.cc ('k') | webrtc/pc/channelmanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698