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

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

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/session_config.h ('k') | remoting/remoting_srcs.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 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 ChannelConfig::CODEC_UNDEFINED); 144 ChannelConfig::CODEC_UNDEFINED);
145 result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM, 145 result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
146 kDefaultStreamVersion, 146 kDefaultStreamVersion,
147 ChannelConfig::CODEC_VP8); 147 ChannelConfig::CODEC_VP8);
148 result->audio_config_ = ChannelConfig(ChannelConfig::TRANSPORT_NONE, 148 result->audio_config_ = ChannelConfig(ChannelConfig::TRANSPORT_NONE,
149 kDefaultStreamVersion, 149 kDefaultStreamVersion,
150 ChannelConfig::CODEC_UNDEFINED); 150 ChannelConfig::CODEC_UNDEFINED);
151 return result.Pass(); 151 return result.Pass();
152 } 152 }
153 153
154 scoped_ptr<SessionConfig> SessionConfig::ForTestWithVerbatimVideo() {
155 scoped_ptr<SessionConfig> result = ForTest();
156 result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
157 kDefaultStreamVersion,
158 ChannelConfig::CODEC_VERBATIM);
159 return result.Pass();
160 }
161
154 SessionConfig::SessionConfig() {} 162 SessionConfig::SessionConfig() {}
155 163
156 CandidateSessionConfig::CandidateSessionConfig() {} 164 CandidateSessionConfig::CandidateSessionConfig() {}
157 CandidateSessionConfig::CandidateSessionConfig( 165 CandidateSessionConfig::CandidateSessionConfig(
158 const CandidateSessionConfig& config) = default; 166 const CandidateSessionConfig& config) = default;
159 CandidateSessionConfig::~CandidateSessionConfig() {} 167 CandidateSessionConfig::~CandidateSessionConfig() {}
160 168
161 bool CandidateSessionConfig::IsSupported(const SessionConfig& config) const { 169 bool CandidateSessionConfig::IsSupported(const SessionConfig& config) const {
162 return config.standard_ice() && 170 return config.standard_ice() &&
163 IsChannelConfigSupported(control_configs_, config.control_config()) && 171 IsChannelConfigSupported(control_configs_, config.control_config()) &&
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 void CandidateSessionConfig::PreferTransport( 259 void CandidateSessionConfig::PreferTransport(
252 ChannelConfig::TransportType transport) { 260 ChannelConfig::TransportType transport) {
253 UpdateConfigListToPreferTransport(&control_configs_, transport); 261 UpdateConfigListToPreferTransport(&control_configs_, transport);
254 UpdateConfigListToPreferTransport(&event_configs_, transport); 262 UpdateConfigListToPreferTransport(&event_configs_, transport);
255 UpdateConfigListToPreferTransport(&video_configs_, transport); 263 UpdateConfigListToPreferTransport(&video_configs_, transport);
256 UpdateConfigListToPreferTransport(&audio_configs_, transport); 264 UpdateConfigListToPreferTransport(&audio_configs_, transport);
257 } 265 }
258 266
259 } // namespace protocol 267 } // namespace protocol
260 } // namespace remoting 268 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/session_config.h ('k') | remoting/remoting_srcs.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698