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

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

Issue 301453003: Host extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed remoting_host.gypi Created 6 years, 6 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
« no previous file with comments | « remoting/host/host_mock_objects.h ('k') | remoting/remoting_host.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 } 42 }
43 43
44 bool SessionConfig::SupportsCapabilities() const { 44 bool SessionConfig::SupportsCapabilities() const {
45 return control_config_.version >= kControlStreamVersion; 45 return control_config_.version >= kControlStreamVersion;
46 } 46 }
47 47
48 // static 48 // static
49 SessionConfig SessionConfig::ForTest() { 49 SessionConfig SessionConfig::ForTest() {
50 SessionConfig result; 50 SessionConfig result;
51 result.set_control_config(ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, 51 result.set_control_config(ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
52 kControlStreamVersionNoCapabilities, 52 kControlStreamVersion,
53 ChannelConfig::CODEC_UNDEFINED)); 53 ChannelConfig::CODEC_UNDEFINED));
54 result.set_event_config(ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, 54 result.set_event_config(ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
55 kDefaultStreamVersion, 55 kDefaultStreamVersion,
56 ChannelConfig::CODEC_UNDEFINED)); 56 ChannelConfig::CODEC_UNDEFINED));
57 result.set_video_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM, 57 result.set_video_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
58 kDefaultStreamVersion, 58 kDefaultStreamVersion,
59 ChannelConfig::CODEC_VP8)); 59 ChannelConfig::CODEC_VP8));
60 result.set_audio_config(ChannelConfig(ChannelConfig::TRANSPORT_NONE, 60 result.set_audio_config(ChannelConfig(ChannelConfig::TRANSPORT_NONE,
61 kDefaultStreamVersion, 61 kDefaultStreamVersion,
62 ChannelConfig::CODEC_UNDEFINED)); 62 ChannelConfig::CODEC_UNDEFINED));
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 void CandidateSessionConfig::EnableVideoCodec(ChannelConfig::Codec codec) { 215 void CandidateSessionConfig::EnableVideoCodec(ChannelConfig::Codec codec) {
216 mutable_video_configs()->push_front( 216 mutable_video_configs()->push_front(
217 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, 217 ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
218 kDefaultStreamVersion, 218 kDefaultStreamVersion,
219 codec)); 219 codec));
220 } 220 }
221 221
222 } // namespace protocol 222 } // namespace protocol
223 } // namespace remoting 223 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/host_mock_objects.h ('k') | remoting/remoting_host.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698