Improve handling of NONE transport in channel configuration.

remoting/protocol/session_config.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/session_config.h"
 
 #include <algorithm>
 
 namespace remoting {
 namespace protocol {
 
 const int kDefaultStreamVersion = 2;
 
-ChannelConfig::ChannelConfig() {
-  Reset();
+ChannelConfig::ChannelConfig()
+    : transport(TRANSPORT_NONE),
+      version(0),
+      codec(CODEC_UNDEFINED) {
 }
 
 ChannelConfig::ChannelConfig(TransportType transport, int version, Codec codec)
     : transport(transport),
       version(version),
       codec(codec) {
 }
 
 bool ChannelConfig::operator==(const ChannelConfig& b) const {
+  // If the transport field is set to NONE then all other fields are irrelevant.
+  if (transport == ChannelConfig::TRANSPORT_NONE)
+    return transport == b.transport;
   return transport == b.transport && version == b.version && codec == b.codec;
 }
 
-void ChannelConfig::Reset() {
-  transport = TRANSPORT_STREAM;
-  version = kDefaultStreamVersion;
-  codec = CODEC_UNDEFINED;
-}
-
 SessionConfig::SessionConfig() {
 }
 
 // static
 SessionConfig SessionConfig::GetDefault() {
   SessionConfig result;
   result.set_control_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                                           kDefaultStreamVersion,
                                           ChannelConfig::CODEC_UNDEFINED));
   result.set_event_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
@@ skipping 140 matching lines @@
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
 
   // Video channel.
   result->mutable_video_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_VP8));
 
   // Audio channel.
-  result->mutable_audio_configs()->push_back(
-      ChannelConfig(ChannelConfig::TRANSPORT_NONE,
-                    kDefaultStreamVersion,
-                    ChannelConfig::CODEC_VERBATIM));
+  result->mutable_audio_configs()->push_back(ChannelConfig());
 #if defined(ENABLE_REMOTING_AUDIO)
   EnableAudioChannel(result.get());
 #endif  // defined(ENABLE_REMOTING_AUDIO)
 
   return result.Pass();
 }
 
 // static
 void CandidateSessionConfig::EnableAudioChannel(
   CandidateSessionConfig* config) {
   config->mutable_audio_configs()->clear();
   config->mutable_audio_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_VERBATIM));
   config->mutable_audio_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_VERBATIM));
-  config->mutable_audio_configs()->push_back(
-      ChannelConfig(ChannelConfig::TRANSPORT_NONE,
-                    kDefaultStreamVersion,
-                    ChannelConfig::CODEC_VERBATIM));
+  config->mutable_audio_configs()->push_back(ChannelConfig());
 }
 
 }  // namespace protocol
 }  // namespace remoting