diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 19:38:00 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 19:38:00 +0000 |
| commit | 1328cd6d7bb5339034b22a939f1792c1deadedd7 (patch) | |
| tree | 57f81d13cee4975145d5bbd252b294129fd433d7 /remoting/protocol/session_config.cc | |
| parent | f687f1a28f9a6b7236e749624d95289307194478 (diff) | |
| download | chromium_src-1328cd6d7bb5339034b22a939f1792c1deadedd7.zip chromium_src-1328cd6d7bb5339034b22a939f1792c1deadedd7.tar.gz chromium_src-1328cd6d7bb5339034b22a939f1792c1deadedd7.tar.bz2 | |
Disable RTP support in remoting protocol code.
Also disabled Zip encoder/decoder.
TEST=Compiles,connects
BUG=91538
Review URL: http://codereview.chromium.org/7563010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/session_config.cc')
| -rw-r--r-- | remoting/protocol/session_config.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc index db4f071..c173418 100644 --- a/remoting/protocol/session_config.cc +++ b/remoting/protocol/session_config.cc @@ -89,7 +89,7 @@ SessionConfig* SessionConfig::CreateDefault() { ChannelConfig::CODEC_UNDEFINED)); result->SetVideoConfig(ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, - ChannelConfig::CODEC_ZIP)); + ChannelConfig::CODEC_VP8)); return result; } @@ -111,6 +111,7 @@ SessionConfig* CandidateSessionConfig::Select( ChannelConfig control_config; ChannelConfig event_config; ChannelConfig video_config; + if (!SelectCommonChannelConfig( control_configs_, client_config->control_configs_, &control_config) || !SelectCommonChannelConfig( @@ -213,18 +214,9 @@ CandidateSessionConfig* CandidateSessionConfig::CreateDefault() { ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, ChannelConfig::CODEC_UNDEFINED)); - - result->mutable_video_configs()->push_back( - ChannelConfig(ChannelConfig::TRANSPORT_STREAM, - kDefaultStreamVersion, - ChannelConfig::CODEC_VP8)); result->mutable_video_configs()->push_back( ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, - ChannelConfig::CODEC_ZIP)); - result->mutable_video_configs()->push_back( - ChannelConfig(ChannelConfig::TRANSPORT_SRTP, - kDefaultStreamVersion, ChannelConfig::CODEC_VP8)); return result; } |