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

Unified Diff: webrtc/pc/channelmanager.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/pc/channelmanager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/channelmanager.cc
diff --git a/webrtc/pc/channelmanager.cc b/webrtc/pc/channelmanager.cc
index 255730a0ba4a9da381337c4c589b7f682b06205b..fec57004a6ad754864f2f3741ce3b9f788b9c5cf 100644
--- a/webrtc/pc/channelmanager.cc
+++ b/webrtc/pc/channelmanager.cc
@@ -346,10 +346,22 @@ DataChannel* ChannelManager::CreateDataChannel(
const std::string* bundle_transport_name,
bool rtcp,
DataChannelType channel_type) {
+ return CreateDataChannel(transport_controller, nullptr, content_name,
+ bundle_transport_name, rtcp, channel_type);
+}
+
+DataChannel* ChannelManager::CreateDataChannel(
+ TransportController* transport_controller,
+ webrtc::MediaControllerInterface* media_controller,
+ const std::string& content_name,
+ const std::string* bundle_transport_name,
+ bool rtcp,
+ DataChannelType channel_type) {
return worker_thread_->Invoke<DataChannel*>(
RTC_FROM_HERE,
Bind(&ChannelManager::CreateDataChannel_w, this, transport_controller,
- content_name, bundle_transport_name, rtcp, channel_type));
+ content_name, bundle_transport_name, rtcp, channel_type,
+ media_controller));
}
DataChannel* ChannelManager::CreateDataChannel_w(
@@ -357,11 +369,16 @@ DataChannel* ChannelManager::CreateDataChannel_w(
const std::string& content_name,
const std::string* bundle_transport_name,
bool rtcp,
- DataChannelType data_channel_type) {
+ DataChannelType data_channel_type,
+ webrtc::MediaControllerInterface* media_controller) {
// This is ok to alloc from a thread other than the worker thread.
ASSERT(initialized_);
- DataMediaChannel* media_channel = data_media_engine_->CreateChannel(
- data_channel_type);
+ MediaConfig config;
+ if (media_controller) {
+ config = media_controller->config();
+ }
+ DataMediaChannel* media_channel =
+ data_media_engine_->CreateChannel(data_channel_type, config);
if (!media_channel) {
LOG(LS_WARNING) << "Failed to create data channel of type "
<< data_channel_type;
« no previous file with comments | « webrtc/pc/channelmanager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698