| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 // Video channel. | 191 // Video channel. |
| 192 result->mutable_video_configs()->push_back( | 192 result->mutable_video_configs()->push_back( |
| 193 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 193 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 194 kDefaultStreamVersion, | 194 kDefaultStreamVersion, |
| 195 ChannelConfig::CODEC_VP8)); | 195 ChannelConfig::CODEC_VP8)); |
| 196 | 196 |
| 197 // Audio channel. | 197 // Audio channel. |
| 198 result->mutable_audio_configs()->push_back( | 198 result->mutable_audio_configs()->push_back( |
| 199 ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, | 199 ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, |
| 200 kDefaultStreamVersion, | 200 kDefaultStreamVersion, |
| 201 ChannelConfig::CODEC_OPUS)); |
| 202 result->mutable_audio_configs()->push_back( |
| 203 ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, |
| 204 kDefaultStreamVersion, |
| 201 ChannelConfig::CODEC_SPEEX)); | 205 ChannelConfig::CODEC_SPEEX)); |
| 202 result->mutable_audio_configs()->push_back( | 206 result->mutable_audio_configs()->push_back( |
| 203 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 207 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 204 kDefaultStreamVersion, | 208 kDefaultStreamVersion, |
| 205 ChannelConfig::CODEC_SPEEX)); | 209 ChannelConfig::CODEC_SPEEX)); |
| 206 result->mutable_audio_configs()->push_back( | 210 result->mutable_audio_configs()->push_back( |
| 207 ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, | 211 ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, |
| 208 kDefaultStreamVersion, | 212 kDefaultStreamVersion, |
| 209 ChannelConfig::CODEC_VERBATIM)); | 213 ChannelConfig::CODEC_VERBATIM)); |
| 210 result->mutable_audio_configs()->push_back(ChannelConfig::None()); | 214 result->mutable_audio_configs()->push_back(ChannelConfig::None()); |
| 211 | 215 |
| 212 return result.Pass(); | 216 return result.Pass(); |
| 213 } | 217 } |
| 214 | 218 |
| 215 // static | 219 // static |
| 216 void CandidateSessionConfig::DisableAudioChannel( | 220 void CandidateSessionConfig::DisableAudioChannel( |
| 217 CandidateSessionConfig* config) { | 221 CandidateSessionConfig* config) { |
| 218 config->mutable_audio_configs()->clear(); | 222 config->mutable_audio_configs()->clear(); |
| 219 config->mutable_audio_configs()->push_back(ChannelConfig()); | 223 config->mutable_audio_configs()->push_back(ChannelConfig()); |
| 220 } | 224 } |
| 221 | 225 |
| 222 } // namespace protocol | 226 } // namespace protocol |
| 223 } // namespace remoting | 227 } // namespace remoting |
| OLD | NEW |