diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 04:25:24 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 04:25:24 +0000 |
| commit | 289202f769e31035d5d3d432d50ddd1587f6f0a7 (patch) | |
| tree | 5651a39d1d49faab5aea742c661e247f5c7e798c /remoting/protocol | |
| parent | 7e9bcb81dc35092bfe54dd74515f02875be6b49e (diff) | |
| download | chromium_src-289202f769e31035d5d3d432d50ddd1587f6f0a7.zip chromium_src-289202f769e31035d5d3d432d50ddd1587f6f0a7.tar.gz chromium_src-289202f769e31035d5d3d432d50ddd1587f6f0a7.tar.bz2 | |
Disable chromoting channel multiplexing
Multiplexing has to be disabled because it's not compatible with M21 builds.
Will have to wait for M22 before enabling it back again.
BUG=137135
Review URL: https://chromiumcodereview.appspot.com/10867026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/session_config.cc | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc index b4e1da0..f1f394b 100644 --- a/remoting/protocol/session_config.cc +++ b/remoting/protocol/session_config.cc @@ -163,21 +163,26 @@ 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, @@ -202,18 +207,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, |