Added piping for sending audio packets from host to client.

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 {
@@ skipping 25 matching lines @@
   SessionConfig result;
   result.set_control_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                                           kDefaultStreamVersion,
                                           ChannelConfig::CODEC_UNDEFINED));
   result.set_event_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                                         kDefaultStreamVersion,
                                         ChannelConfig::CODEC_UNDEFINED));
   result.set_video_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                                         kDefaultStreamVersion,
                                         ChannelConfig::CODEC_VP8));
+  result.set_audio_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
+                                        kDefaultStreamVersion,
+                                        ChannelConfig::CODEC_UNDEFINED));

[Wez, 2012/06/22 18:29:53]

Why is the default audio channel config "undefined"? Surely we want
CODEC_VERBATIM (I assume we'll use this for PCM audio?) or CODEC_VORBIS, or not
to specify audio in the default config at all?  Or did you mean transport to be
"none" here?

[kxing, 2012/06/22 19:12:31]

Right, I meant CODEC_VERBATIM.

   return result;
 }
 
 CandidateSessionConfig::CandidateSessionConfig() { }
 
 CandidateSessionConfig::CandidateSessionConfig(
     const CandidateSessionConfig& config)
     : control_configs_(config.control_configs_),
       event_configs_(config.event_configs_),
-      video_configs_(config.video_configs_) {
+      video_configs_(config.video_configs_),
+      audio_configs_(config.audio_configs_) {
 }
 
 CandidateSessionConfig::~CandidateSessionConfig() { }
 
 bool CandidateSessionConfig::Select(
     const CandidateSessionConfig* client_config,
     SessionConfig* result) {
   ChannelConfig control_config;
   ChannelConfig event_config;
   ChannelConfig video_config;
+  ChannelConfig audio_config;
 
   if (!SelectCommonChannelConfig(
           control_configs_, client_config->control_configs_, &control_config) ||
       !SelectCommonChannelConfig(
           event_configs_, client_config->event_configs_, &event_config) ||
       !SelectCommonChannelConfig(
-          video_configs_, client_config->video_configs_, &video_config)) {
+          video_configs_, client_config->video_configs_, &video_config) ||
+      !SelectCommonChannelConfig(
+          audio_configs_, client_config->audio_configs_, &audio_config)) {
     return false;
   }
 
   result->set_control_config(control_config);
   result->set_event_config(event_config);
   result->set_video_config(video_config);
+  result->set_audio_config(audio_config);
 
   return true;
 }
 
 bool CandidateSessionConfig::IsSupported(
     const SessionConfig& config) const {
   return
       IsChannelConfigSupported(control_configs_, config.control_config()) &&
       IsChannelConfigSupported(event_configs_, config.event_config()) &&
-      IsChannelConfigSupported(video_configs_, config.video_config());
+      IsChannelConfigSupported(video_configs_, config.video_config()) &&
+      IsChannelConfigSupported(audio_configs_, config.audio_config());
 }
 
 bool CandidateSessionConfig::GetFinalConfig(SessionConfig* result) const {
   if (control_configs_.size() != 1 ||
       event_configs_.size() != 1 ||
-      video_configs_.size() != 1) {
+      video_configs_.size() != 1 ||
+      audio_configs_.size() != 1) {
     return false;
   }
 
   result->set_control_config(control_configs_.front());
   result->set_event_config(event_configs_.front());
   result->set_video_config(video_configs_.front());
+  result->set_audio_config(audio_configs_.front());
 
   return true;
 }
 
 // static
 bool CandidateSessionConfig::SelectCommonChannelConfig(
     const std::vector<ChannelConfig>& host_configs,
     const std::vector<ChannelConfig>& client_configs,
     ChannelConfig* config) {
   // Usually each of these vectors will contain just several elements,
@@ skipping 24 matching lines @@
   return scoped_ptr<CandidateSessionConfig>(new CandidateSessionConfig());
 }
 
 // static
 scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateFrom(
     const SessionConfig& config) {
   scoped_ptr<CandidateSessionConfig> result = CreateEmpty();
   result->mutable_control_configs()->push_back(config.control_config());
   result->mutable_event_configs()->push_back(config.event_config());
   result->mutable_video_configs()->push_back(config.video_config());
+  result->mutable_audio_configs()->push_back(config.audio_config());
   return result.Pass();
 }
 
 // static
 scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
   scoped_ptr<CandidateSessionConfig> result = CreateEmpty();
   result->mutable_control_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
   result->mutable_event_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
   result->mutable_video_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_VP8));
+  result->mutable_audio_configs()->push_back(
+      ChannelConfig(ChannelConfig::TRANSPORT_NONE,
+                    kDefaultStreamVersion,
+                    ChannelConfig::CODEC_UNDEFINED));
+  result->mutable_audio_configs()->push_back(
+      ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
+                    kDefaultStreamVersion,
+                    ChannelConfig::CODEC_VERBATIM));
+  result->mutable_audio_configs()->push_back(
+      ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
+                    kDefaultStreamVersion,
+                    ChannelConfig::CODEC_VORBIS));
   return result.Pass();
 }
 
 }  // namespace protocol
 }  // namespace remoting