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

Unified Diff: remoting/protocol/session_config.cc

Issue 1493083002: Remove QUIC support from remoting host and client. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/session_config.h ('k') | remoting/protocol/transport.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/session_config.cc
diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc
index 0aa2c8ed9a2ca4b88c584fe220002bb1f0e16ee8..ebdfab29d3ced8a6e675ed1a5f573a079a879a4e 100644
--- a/remoting/protocol/session_config.cc
+++ b/remoting/protocol/session_config.cc
@@ -149,13 +149,13 @@ scoped_ptr<SessionConfig> SessionConfig::GetFinalConfig(
// static
scoped_ptr<SessionConfig> SessionConfig::ForTest() {
scoped_ptr<SessionConfig> result(new SessionConfig(Protocol::ICE));
- result->control_config_ = ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
+ result->control_config_ = ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
kControlStreamVersion,
ChannelConfig::CODEC_UNDEFINED);
- result->event_config_ = ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
+ result->event_config_ = ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
kDefaultStreamVersion,
ChannelConfig::CODEC_UNDEFINED);
- result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
+ result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
kDefaultStreamVersion,
ChannelConfig::CODEC_VP8);
result->audio_config_ = ChannelConfig(ChannelConfig::TRANSPORT_NONE,
@@ -166,7 +166,7 @@ scoped_ptr<SessionConfig> SessionConfig::ForTest() {
scoped_ptr<SessionConfig> SessionConfig::ForTestWithVerbatimVideo() {
scoped_ptr<SessionConfig> result = ForTest();
- result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
+ result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
kDefaultStreamVersion,
ChannelConfig::CODEC_VERBATIM);
return result.Pass();
@@ -193,14 +193,6 @@ const ChannelConfig& SessionConfig::audio_config() const {
return audio_config_;
}
-bool SessionConfig::is_using_quic() const {
- DCHECK(protocol_ == Protocol::ICE);
- return control_config_.transport == ChannelConfig::TRANSPORT_QUIC_STREAM ||
- event_config_.transport == ChannelConfig::TRANSPORT_QUIC_STREAM ||
- video_config_.transport == ChannelConfig::TRANSPORT_QUIC_STREAM ||
- audio_config_.transport == ChannelConfig::TRANSPORT_QUIC_STREAM;
-}
-
SessionConfig::SessionConfig(Protocol protocol) : protocol_(protocol) {}
CandidateSessionConfig::CandidateSessionConfig() {}
@@ -270,20 +262,12 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
kControlStreamVersion,
ChannelConfig::CODEC_UNDEFINED));
- result->mutable_control_configs()->push_back(
- ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
- kControlStreamVersion,
- ChannelConfig::CODEC_UNDEFINED));
// Event channel.
result->mutable_event_configs()->push_back(
ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
kDefaultStreamVersion,
ChannelConfig::CODEC_UNDEFINED));
- result->mutable_event_configs()->push_back(
- ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
- kDefaultStreamVersion,
- ChannelConfig::CODEC_UNDEFINED));
// Video channel.
result->mutable_video_configs()->push_back(
@@ -294,24 +278,12 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
kDefaultStreamVersion,
ChannelConfig::CODEC_VP8));
- result->mutable_video_configs()->push_back(
- ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
- kDefaultStreamVersion,
- ChannelConfig::CODEC_VP9));
- result->mutable_video_configs()->push_back(
- ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
- kDefaultStreamVersion,
- ChannelConfig::CODEC_VP8));
// Audio channel.
result->mutable_audio_configs()->push_back(
ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
kDefaultStreamVersion,
ChannelConfig::CODEC_OPUS));
- result->mutable_audio_configs()->push_back(
- ChannelConfig(ChannelConfig::TRANSPORT_QUIC_STREAM,
- kDefaultStreamVersion,
- ChannelConfig::CODEC_OPUS));
result->mutable_audio_configs()->push_back(ChannelConfig::None());
return result.Pass();
« no previous file with comments | « remoting/protocol/session_config.h ('k') | remoting/protocol/transport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698