| 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 kControlStreamVersionNoCapabilities, | 185 kControlStreamVersionNoCapabilities, |
| 186 ChannelConfig::CODEC_UNDEFINED)); | 186 ChannelConfig::CODEC_UNDEFINED)); |
| 187 | 187 |
| 188 // Event channel. | 188 // Event channel. |
| 189 result->mutable_event_configs()->push_back( | 189 result->mutable_event_configs()->push_back( |
| 190 ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, | 190 ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, |
| 191 kDefaultStreamVersion, | 191 kDefaultStreamVersion, |
| 192 ChannelConfig::CODEC_UNDEFINED)); | 192 ChannelConfig::CODEC_UNDEFINED)); |
| 193 | 193 |
| 194 // Video channel. | 194 // Video channel. |
| 195 #if !defined(MEDIA_DISABLE_LIBVPX) |
| 195 result->mutable_video_configs()->push_back( | 196 result->mutable_video_configs()->push_back( |
| 196 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 197 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 197 kDefaultStreamVersion, | 198 kDefaultStreamVersion, |
| 198 ChannelConfig::CODEC_VP8)); | 199 ChannelConfig::CODEC_VP8)); |
| 200 #endif // !defined(MEDIA_DISABLE_LIBVPX) |
| 199 | 201 |
| 200 // Audio channel. | 202 // Audio channel. |
| 201 result->mutable_audio_configs()->push_back( | 203 result->mutable_audio_configs()->push_back( |
| 202 ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, | 204 ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, |
| 203 kDefaultStreamVersion, | 205 kDefaultStreamVersion, |
| 204 ChannelConfig::CODEC_OPUS)); | 206 ChannelConfig::CODEC_OPUS)); |
| 205 result->mutable_audio_configs()->push_back(ChannelConfig::None()); | 207 result->mutable_audio_configs()->push_back(ChannelConfig::None()); |
| 206 | 208 |
| 207 return result.Pass(); | 209 return result.Pass(); |
| 208 } | 210 } |
| 209 | 211 |
| 210 void CandidateSessionConfig::DisableAudioChannel() { | 212 void CandidateSessionConfig::DisableAudioChannel() { |
| 211 mutable_audio_configs()->clear(); | 213 mutable_audio_configs()->clear(); |
| 212 mutable_audio_configs()->push_back(ChannelConfig()); | 214 mutable_audio_configs()->push_back(ChannelConfig()); |
| 213 } | 215 } |
| 214 | 216 |
| 215 void CandidateSessionConfig::EnableVideoCodec(ChannelConfig::Codec codec) { | 217 void CandidateSessionConfig::EnableVideoCodec(ChannelConfig::Codec codec) { |
| 216 mutable_video_configs()->push_front( | 218 mutable_video_configs()->push_front( |
| 217 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 219 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 218 kDefaultStreamVersion, | 220 kDefaultStreamVersion, |
| 219 codec)); | 221 codec)); |
| 220 } | 222 } |
| 221 | 223 |
| 222 } // namespace protocol | 224 } // namespace protocol |
| 223 } // namespace remoting | 225 } // namespace remoting |
| OLD | NEW |