Added piping for sending audio packets from host to client.

remoting/protocol/connection_to_client.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/connection_to_client.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "google/protobuf/message.h"
@@ skipping 50 matching lines @@
 void ConnectionToClient::UpdateSequenceNumber(int64 sequence_number) {
   DCHECK(CalledOnValidThread());
   handler_->OnSequenceNumberUpdated(this, sequence_number);
 }
 
 VideoStub* ConnectionToClient::video_stub() {
   DCHECK(CalledOnValidThread());
   return video_writer_.get();
 }
 
+AudioStub* ConnectionToClient::audio_stub() {
+  DCHECK(CalledOnValidThread());
+  return audio_writer_.get();
+}
+
 // Return pointer to ClientStub.
 ClientStub* ConnectionToClient::client_stub() {
   DCHECK(CalledOnValidThread());
   return control_dispatcher_.get();
 }
 
 void ConnectionToClient::set_clipboard_stub(
     protocol::ClipboardStub* clipboard_stub) {
   DCHECK(CalledOnValidThread());
   clipboard_stub_ = clipboard_stub;
@@ skipping 32 matching lines @@
       event_dispatcher_->Init(session_.get(), base::Bind(
           &ConnectionToClient::OnChannelInitialized, base::Unretained(this)));
       event_dispatcher_->set_input_stub(input_stub_);
       event_dispatcher_->set_sequence_number_callback(base::Bind(
           &ConnectionToClient::UpdateSequenceNumber, base::Unretained(this)));
 
       video_writer_ = VideoWriter::Create(session_->config());
       video_writer_->Init(session_.get(), base::Bind(
           &ConnectionToClient::OnChannelInitialized, base::Unretained(this)));
 
+      audio_writer_ = AudioWriter::Create(session_->config());
+      if (audio_writer_ != NULL) {

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

nit: if (audio_writer_.get()) seems clearer here, since audio_writer_ is a
scoped_ptr<>, not a bare pointer. Consider adding a comment to indicate that the
audio channel is optional.

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

Done.

+        audio_writer_->Init(session_.get(), base::Bind(
+            &ConnectionToClient::OnChannelInitialized, base::Unretained(this)));
+      }
+
       // Notify the handler after initializing the channels, so that
       // ClientSession can get a client clipboard stub.
       handler_->OnConnectionAuthenticated(this);
       break;
 
     case Session::CLOSED:
       Close(OK);
       break;
 
     case Session::FAILED:
@@ skipping 18 matching lines @@
   }
 
   NotifyIfChannelsReady();
 }
 
 void ConnectionToClient::NotifyIfChannelsReady() {
   DCHECK(CalledOnValidThread());
 
   if (control_dispatcher_.get() && control_dispatcher_->is_connected() &&
       event_dispatcher_.get() && event_dispatcher_->is_connected() &&
-      video_writer_.get() && video_writer_->is_connected()) {
+      video_writer_.get() && video_writer_->is_connected() &&
+      (!session_->config().is_audio_enabled() ||
+      (audio_writer_.get() && audio_writer_->is_connected()))) {

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

nit: This if has become silly; we should re-express this as a series of
early-exits, i.e.

if (!control_dispatcher_.get() || !control_dispatcher_.is_connected())
  return;
...

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

Done.

     handler_->OnConnectionChannelsConnected(this);
   }
 }
 
 void ConnectionToClient::Close(ErrorCode error) {
   CloseChannels();
   handler_->OnConnectionClosed(this, error);
 }
 
 void ConnectionToClient::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
   video_writer_.reset();
+  audio_writer_.reset();
 }
 
 }  // namespace protocol
 }  // namespace remoting