Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(737)

Side by Side Diff: remoting/protocol/session_config.cc

Issue 10831246: Speex encoding/decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
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) 178 #if defined(ENABLE_REMOTING_AUDIO)
179 result->mutable_audio_configs()->push_back( 179 result->mutable_audio_configs()->push_back(
180 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, 180 ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
181 kDefaultStreamVersion, 181 kDefaultStreamVersion,
182 ChannelConfig::CODEC_SPEEX));
183 result->mutable_audio_configs()->push_back(
184 ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
185 kDefaultStreamVersion,
182 ChannelConfig::CODEC_VERBATIM)); 186 ChannelConfig::CODEC_VERBATIM));
183 #endif // defined(ENABLE_REMOTING_AUDIO) 187 #endif // defined(ENABLE_REMOTING_AUDIO)
184 result->mutable_audio_configs()->push_back( 188 result->mutable_audio_configs()->push_back(
185 ChannelConfig(ChannelConfig::TRANSPORT_NONE, 189 ChannelConfig(ChannelConfig::TRANSPORT_NONE,
186 kDefaultStreamVersion, 190 kDefaultStreamVersion,
187 ChannelConfig::CODEC_VERBATIM)); 191 ChannelConfig::CODEC_VERBATIM));
188 return result.Pass(); 192 return result.Pass();
189 } 193 }
190 194
191 } // namespace protocol 195 } // namespace protocol
192 } // namespace remoting 196 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698