| 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 kDefaultStreamVersion, | 168 kDefaultStreamVersion, |
| 169 ChannelConfig::CODEC_UNDEFINED)); | 169 ChannelConfig::CODEC_UNDEFINED)); |
| 170 result->mutable_event_configs()->push_back( | 170 result->mutable_event_configs()->push_back( |
| 171 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 171 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 172 kDefaultStreamVersion, | 172 kDefaultStreamVersion, |
| 173 ChannelConfig::CODEC_UNDEFINED)); | 173 ChannelConfig::CODEC_UNDEFINED)); |
| 174 result->mutable_video_configs()->push_back( | 174 result->mutable_video_configs()->push_back( |
| 175 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 175 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 176 kDefaultStreamVersion, | 176 kDefaultStreamVersion, |
| 177 ChannelConfig::CODEC_VP8)); | 177 ChannelConfig::CODEC_VP8)); |
| 178 #if defined(ENABLE_REMOTING_AUDIO) |
| 179 result->mutable_audio_configs()->push_back( |
| 180 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 181 kDefaultStreamVersion, |
| 182 ChannelConfig::CODEC_VERBATIM)); |
| 183 #endif // defined(ENABLE_REMOTING_AUDIO) |
| 178 result->mutable_audio_configs()->push_back( | 184 result->mutable_audio_configs()->push_back( |
| 179 ChannelConfig(ChannelConfig::TRANSPORT_NONE, | 185 ChannelConfig(ChannelConfig::TRANSPORT_NONE, |
| 180 kDefaultStreamVersion, | 186 kDefaultStreamVersion, |
| 181 ChannelConfig::CODEC_VERBATIM)); | 187 ChannelConfig::CODEC_VERBATIM)); |
| 182 result->mutable_audio_configs()->push_back( | |
| 183 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | |
| 184 kDefaultStreamVersion, | |
| 185 ChannelConfig::CODEC_VERBATIM)); | |
| 186 result->mutable_audio_configs()->push_back( | |
| 187 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | |
| 188 kDefaultStreamVersion, | |
| 189 ChannelConfig::CODEC_VORBIS)); | |
| 190 return result.Pass(); | 188 return result.Pass(); |
| 191 } | 189 } |
| 192 | 190 |
| 193 } // namespace protocol | 191 } // namespace protocol |
| 194 } // namespace remoting | 192 } // namespace remoting |
| OLD | NEW |