| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/protocol/session_config.h" | 5 #include "remoting/protocol/session_config.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 namespace remoting { | 9 namespace remoting { |
| 10 namespace protocol { | 10 namespace protocol { |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 // static | 225 // static |
| 226 CandidateSessionConfig* CandidateSessionConfig::CreateDefault() { | 226 CandidateSessionConfig* CandidateSessionConfig::CreateDefault() { |
| 227 CandidateSessionConfig* result = CreateEmpty(); | 227 CandidateSessionConfig* result = CreateEmpty(); |
| 228 result->AddControlConfig(ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 228 result->AddControlConfig(ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 229 kDefaultStreamVersion, | 229 kDefaultStreamVersion, |
| 230 ChannelConfig::CODEC_UNDEFINED)); | 230 ChannelConfig::CODEC_UNDEFINED)); |
| 231 result->AddEventConfig(ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 231 result->AddEventConfig(ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 232 kDefaultStreamVersion, | 232 kDefaultStreamVersion, |
| 233 ChannelConfig::CODEC_UNDEFINED)); | 233 ChannelConfig::CODEC_UNDEFINED)); |
| 234 | 234 |
| 235 result->AddVideoConfig(ChannelConfig(ChannelConfig::TRANSPORT_SRTP, |
| 236 kDefaultStreamVersion, |
| 237 ChannelConfig::CODEC_VP8)); |
| 235 result->AddVideoConfig(ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 238 result->AddVideoConfig(ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 236 kDefaultStreamVersion, | 239 kDefaultStreamVersion, |
| 237 ChannelConfig::CODEC_ZIP)); | 240 ChannelConfig::CODEC_ZIP)); |
| 238 result->AddVideoConfig(ChannelConfig(ChannelConfig::TRANSPORT_SRTP, | |
| 239 kDefaultStreamVersion, | |
| 240 ChannelConfig::CODEC_VP8)); | |
| 241 return result; | 241 return result; |
| 242 } | 242 } |
| 243 | 243 |
| 244 } // namespace protocol | 244 } // namespace protocol |
| 245 } // namespace remoting | 245 } // namespace remoting |
| OLD | NEW |