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

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

Issue 1288063004: Simplify FrameConsumer interface. Remove FrameProducer interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « remoting/protocol/monitored_video_stub.cc ('k') | remoting/protocol/session_config.cc » ('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 #ifndef REMOTING_PROTOCOL_SESSION_CONFIG_H_ 5 #ifndef REMOTING_PROTOCOL_SESSION_CONFIG_H_
6 #define REMOTING_PROTOCOL_SESSION_CONFIG_H_ 6 #define REMOTING_PROTOCOL_SESSION_CONFIG_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 // Extracts final protocol configuration. Must be used for the description 74 // Extracts final protocol configuration. Must be used for the description
75 // received in the session-accept stanza. If the selection is ambiguous 75 // received in the session-accept stanza. If the selection is ambiguous
76 // (e.g. there is more than one configuration for one of the channel) 76 // (e.g. there is more than one configuration for one of the channel)
77 // or undefined (e.g. no configurations for a channel) then nullptr is 77 // or undefined (e.g. no configurations for a channel) then nullptr is
78 // returned. 78 // returned.
79 static scoped_ptr<SessionConfig> GetFinalConfig( 79 static scoped_ptr<SessionConfig> GetFinalConfig(
80 const CandidateSessionConfig* candidate_config); 80 const CandidateSessionConfig* candidate_config);
81 81
82 // Returns a suitable session configuration for use in tests. 82 // Returns a suitable session configuration for use in tests.
83 static scoped_ptr<SessionConfig> ForTest(); 83 static scoped_ptr<SessionConfig> ForTest();
84 static scoped_ptr<SessionConfig> ForTestWithVerbatimVideo();
84 85
85 bool standard_ice() const { return standard_ice_; } 86 bool standard_ice() const { return standard_ice_; }
86 87
87 const ChannelConfig& control_config() const { return control_config_; } 88 const ChannelConfig& control_config() const { return control_config_; }
88 const ChannelConfig& event_config() const { return event_config_; } 89 const ChannelConfig& event_config() const { return event_config_; }
89 const ChannelConfig& video_config() const { return video_config_; } 90 const ChannelConfig& video_config() const { return video_config_; }
90 const ChannelConfig& audio_config() const { return audio_config_; } 91 const ChannelConfig& audio_config() const { return audio_config_; }
91 92
92 bool is_audio_enabled() const { 93 bool is_audio_enabled() const {
93 return audio_config_.transport != ChannelConfig::TRANSPORT_NONE; 94 return audio_config_.transport != ChannelConfig::TRANSPORT_NONE;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 std::list<ChannelConfig> video_configs_; 193 std::list<ChannelConfig> video_configs_;
193 std::list<ChannelConfig> audio_configs_; 194 std::list<ChannelConfig> audio_configs_;
194 195
195 bool vp9_experiment_enabled_ = false; 196 bool vp9_experiment_enabled_ = false;
196 }; 197 };
197 198
198 } // namespace protocol 199 } // namespace protocol
199 } // namespace remoting 200 } // namespace remoting
200 201
201 #endif // REMOTING_PROTOCOL_SESSION_CONFIG_H_ 202 #endif // REMOTING_PROTOCOL_SESSION_CONFIG_H_
OLDNEW
« no previous file with comments | « remoting/protocol/monitored_video_stub.cc ('k') | remoting/protocol/session_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698