Chromium Code Reviews| 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 ENABLE_AUDIO | |
|
Sergey Ulanov
2012/07/23 22:17:48
#if defined(ENABLE_REMOTING_AUDIO)
kxing
2012/07/24 15:02:16
Done.
| |
| 179 result->mutable_audio_configs()->push_back( | |
| 180 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | |
| 181 kDefaultStreamVersion, | |
| 182 ChannelConfig::CODEC_VERBATIM)); | |
| 178 result->mutable_audio_configs()->push_back( | 183 result->mutable_audio_configs()->push_back( |
| 179 ChannelConfig(ChannelConfig::TRANSPORT_NONE, | 184 ChannelConfig(ChannelConfig::TRANSPORT_NONE, |
| 180 kDefaultStreamVersion, | 185 kDefaultStreamVersion, |
| 186 ChannelConfig::CODEC_VERBATIM)); | |
| 187 #else | |
|
Sergey Ulanov
2012/07/23 22:17:48
#else // !defined(ENABLE_REMOTING_AUDIO)
kxing
2012/07/24 15:02:16
Done.
| |
| 188 result->mutable_audio_configs()->push_back( | |
| 189 ChannelConfig(ChannelConfig::TRANSPORT_NONE, | |
| 190 kDefaultStreamVersion, | |
| 181 ChannelConfig::CODEC_VERBATIM)); | 191 ChannelConfig::CODEC_VERBATIM)); |
| 182 result->mutable_audio_configs()->push_back( | 192 result->mutable_audio_configs()->push_back( |
|
Sergey Ulanov
2012/07/23 22:17:48
I think it's better to remove this config for now
kxing
2012/07/24 15:02:16
Done.
| |
| 183 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 193 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 184 kDefaultStreamVersion, | 194 kDefaultStreamVersion, |
| 185 ChannelConfig::CODEC_VERBATIM)); | 195 ChannelConfig::CODEC_VERBATIM)); |
| 196 #endif | |
|
Sergey Ulanov
2012/07/23 22:17:48
#endig // !defined(ENABLE_REMOTING_AUDIO)
kxing
2012/07/24 15:02:16
Done.
| |
| 186 result->mutable_audio_configs()->push_back( | 197 result->mutable_audio_configs()->push_back( |
| 187 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 198 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 188 kDefaultStreamVersion, | 199 kDefaultStreamVersion, |
| 189 ChannelConfig::CODEC_VORBIS)); | 200 ChannelConfig::CODEC_VORBIS)); |
| 190 return result.Pass(); | 201 return result.Pass(); |
| 191 } | 202 } |
| 192 | 203 |
| 193 } // namespace protocol | 204 } // namespace protocol |
| 194 } // namespace remoting | 205 } // namespace remoting |
| OLD | NEW |