diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-05 00:20:15 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-05 00:20:15 +0000 |
| commit | 048583cfaaba5ab1472df8f56cd4fe84ffaff75a (patch) | |
| tree | 8d59d99f2e6f10d697cdb194fa3e08617b7c28e6 /remoting | |
| parent | 7f51d55666f0a9dd169ddaf42356c2fcfa134b86 (diff) | |
| download | chromium_src-048583cfaaba5ab1472df8f56cd4fe84ffaff75a.zip chromium_src-048583cfaaba5ab1472df8f56cd4fe84ffaff75a.tar.gz chromium_src-048583cfaaba5ab1472df8f56cd4fe84ffaff75a.tar.bz2 | |
Enable channel multiplexing in chromoting.
M22 host build has been pushed. It should be compatible with MUX-enabled
clients, so it's safe to enable multiplexing now.
BUG=137135
Review URL: https://chromiumcodereview.appspot.com/10909066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/protocol/session_config.cc | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc index f1f394b..b4e1da0 100644 --- a/remoting/protocol/session_config.cc +++ b/remoting/protocol/session_config.cc @@ -163,26 +163,21 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateFrom( scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() { scoped_ptr<CandidateSessionConfig> result = CreateEmpty(); - // MUX transport is temporarily disabled because M21 builds fail to parse - // session configs with mux-stream transport. - // TODO(sergeyu): Reenable multiplexing once M22 becomes stable. - // http://crbug.com/137135. - // Control channel. - // result->mutable_control_configs()->push_back( - // ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, - // kDefaultStreamVersion, - // ChannelConfig::CODEC_UNDEFINED)); + result->mutable_control_configs()->push_back( + ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, + kDefaultStreamVersion, + ChannelConfig::CODEC_UNDEFINED)); result->mutable_control_configs()->push_back( ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, ChannelConfig::CODEC_UNDEFINED)); // Event channel. - // result->mutable_event_configs()->push_back( - // ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, - // kDefaultStreamVersion, - // ChannelConfig::CODEC_UNDEFINED)); + result->mutable_event_configs()->push_back( + ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, + kDefaultStreamVersion, + ChannelConfig::CODEC_UNDEFINED)); result->mutable_event_configs()->push_back( ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, @@ -207,18 +202,18 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() { void CandidateSessionConfig::EnableAudioChannel( CandidateSessionConfig* config) { config->mutable_audio_configs()->clear(); - // config->mutable_audio_configs()->push_back( - // ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, - // kDefaultStreamVersion, - // ChannelConfig::CODEC_SPEEX)); + config->mutable_audio_configs()->push_back( + ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, + kDefaultStreamVersion, + ChannelConfig::CODEC_SPEEX)); config->mutable_audio_configs()->push_back( ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, ChannelConfig::CODEC_SPEEX)); - // config->mutable_audio_configs()->push_back( - // ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, - // kDefaultStreamVersion, - // ChannelConfig::CODEC_VERBATIM)); + config->mutable_audio_configs()->push_back( + ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, + kDefaultStreamVersion, + ChannelConfig::CODEC_VERBATIM)); config->mutable_audio_configs()->push_back( ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, |