Chromium Code Reviews| Index: remoting/protocol/session_config.cc |
| diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc |
| index cf6657ddd5bb8e44610c8f1f48ff3eb93f0b6804..c3d56e6c3cf0ffeac3fb3d920ae4ccf9619f2ac1 100644 |
| --- a/remoting/protocol/session_config.cc |
| +++ b/remoting/protocol/session_config.cc |
| @@ -175,6 +175,16 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() { |
| ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| kDefaultStreamVersion, |
| ChannelConfig::CODEC_VP8)); |
| +#if ENABLE_AUDIO |
|
Sergey Ulanov
2012/07/23 22:17:48
#if defined(ENABLE_REMOTING_AUDIO)
kxing
2012/07/24 15:02:16
Done.
|
| + result->mutable_audio_configs()->push_back( |
| + ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| + kDefaultStreamVersion, |
| + ChannelConfig::CODEC_VERBATIM)); |
| + result->mutable_audio_configs()->push_back( |
| + ChannelConfig(ChannelConfig::TRANSPORT_NONE, |
| + kDefaultStreamVersion, |
| + ChannelConfig::CODEC_VERBATIM)); |
| +#else |
|
Sergey Ulanov
2012/07/23 22:17:48
#else // !defined(ENABLE_REMOTING_AUDIO)
kxing
2012/07/24 15:02:16
Done.
|
| result->mutable_audio_configs()->push_back( |
| ChannelConfig(ChannelConfig::TRANSPORT_NONE, |
| kDefaultStreamVersion, |
| @@ -183,6 +193,7 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() { |
| ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| kDefaultStreamVersion, |
| ChannelConfig::CODEC_VERBATIM)); |
| +#endif |
|
Sergey Ulanov
2012/07/23 22:17:48
#endig // !defined(ENABLE_REMOTING_AUDIO)
kxing
2012/07/24 15:02:16
Done.
|
| result->mutable_audio_configs()->push_back( |
| ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| kDefaultStreamVersion, |