Added piping for sending audio packets from host to client.

remoting/protocol/connection_to_host.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_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "remoting/base/constants.h"
 #include "remoting/jingle_glue/javascript_signal_strategy.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
+#include "remoting/protocol/audio_reader.h"
+#include "remoting/protocol/audio_stub.h"
 #include "remoting/protocol/auth_util.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/client_control_dispatcher.h"
 #include "remoting/protocol/client_event_dispatcher.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/errors.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/transport.h"
 #include "remoting/protocol/video_reader.h"
 #include "remoting/protocol/video_stub.h"
 #include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
 
 ConnectionToHost::ConnectionToHost(
     bool allow_nat_traversal)
     : allow_nat_traversal_(allow_nat_traversal),
       event_callback_(NULL),
       client_stub_(NULL),
       clipboard_stub_(NULL),
       video_stub_(NULL),
+      audio_stub_(NULL),
       state_(CONNECTING),
       error_(OK) {
 }
 
 ConnectionToHost::~ConnectionToHost() {
 }
 
 ClipboardStub* ConnectionToHost::clipboard_stub() {
   return &clipboard_forwarder_;
 }
 
 HostStub* ConnectionToHost::host_stub() {
   // TODO(wez): Add a HostFilter class, equivalent to input filter.
   return control_dispatcher_.get();
 }
 
 InputStub* ConnectionToHost::input_stub() {
   return &event_forwarder_;
 }
 
 void ConnectionToHost::Connect(scoped_refptr<XmppProxy> xmpp_proxy,
                                const std::string& local_jid,
                                const std::string& host_jid,
                                const std::string& host_public_key,
                                scoped_ptr<TransportFactory> transport_factory,
                                scoped_ptr<Authenticator> authenticator,
                                HostEventCallback* event_callback,
                                ClientStub* client_stub,
                                ClipboardStub* clipboard_stub,
-                               VideoStub* video_stub) {
+                               VideoStub* video_stub,
+                               AudioStub* audio_stub) {
   event_callback_ = event_callback;
   client_stub_ = client_stub;
   clipboard_stub_ = clipboard_stub;
   video_stub_ = video_stub;
+  audio_stub_ = audio_stub;
   authenticator_ = authenticator.Pass();
 
   // Save jid of the host. The actual connection is created later after
   // |signal_strategy_| is connected.
   host_jid_ = host_jid;
   host_public_key_ = host_public_key;
 
   JavascriptSignalStrategy* strategy = new JavascriptSignalStrategy(local_jid);
   strategy->AttachXmppProxy(xmpp_proxy);
   signal_strategy_.reset(strategy);
@@ skipping 75 matching lines @@
     case Session::CONNECTING:
     case Session::CONNECTED:
       // Don't care about these events.
       break;
 
     case Session::AUTHENTICATED:
       video_reader_ = VideoReader::Create(session_->config());
       video_reader_->Init(session_.get(), video_stub_, base::Bind(
           &ConnectionToHost::OnChannelInitialized, base::Unretained(this)));
 
+      audio_reader_ = AudioReader::Create(session_->config());
+      if (audio_reader_.get()) {
+        audio_reader_->Init(session_.get(), audio_stub_, base::Bind(
+            &ConnectionToHost::OnChannelInitialized, base::Unretained(this)));
+      }
+
       control_dispatcher_.reset(new ClientControlDispatcher());
       control_dispatcher_->Init(session_.get(), base::Bind(
           &ConnectionToHost::OnChannelInitialized, base::Unretained(this)));
       control_dispatcher_->set_client_stub(client_stub_);
       control_dispatcher_->set_clipboard_stub(clipboard_stub_);
 
       event_dispatcher_.reset(new ClientEventDispatcher());
       event_dispatcher_->Init(session_.get(), base::Bind(
           &ConnectionToHost::OnChannelInitialized, base::Unretained(this)));
       break;
@@ skipping 26 matching lines @@
   if (!successful) {
     LOG(ERROR) << "Failed to connect video channel";
     CloseOnError(CHANNEL_CONNECTION_ERROR);
     return;
   }
 
   NotifyIfChannelsReady();
 }
 
 void ConnectionToHost::NotifyIfChannelsReady() {
-  if (control_dispatcher_.get() && control_dispatcher_->is_connected() &&
-      event_dispatcher_.get() && event_dispatcher_->is_connected() &&
-      video_reader_.get() && video_reader_->is_connected() &&
-      state_ == CONNECTING) {
-    // Start forwarding clipboard and input events.
-    clipboard_forwarder_.set_clipboard_stub(control_dispatcher_.get());
-    event_forwarder_.set_input_stub(event_dispatcher_.get());
-    SetState(CONNECTED, OK);
+  if (!control_dispatcher_.get() || !control_dispatcher_->is_connected())
+    return;
+  if (!event_dispatcher_.get() || !event_dispatcher_->is_connected())
+    return;
+  if (!video_reader_.get() || !video_reader_->is_connected())
+    return;
+  if ((!audio_reader_.get() || !audio_reader_->is_connected()) &&
+      session_->config().is_audio_enabled()) {
+    return;
   }
+  if (state_ != CONNECTING)
+    return;
+
+  // Start forwarding clipboard and input events.
+  clipboard_forwarder_.set_clipboard_stub(control_dispatcher_.get());
+  event_forwarder_.set_input_stub(event_dispatcher_.get());
+  SetState(CONNECTED, OK);
 }
 
 void ConnectionToHost::CloseOnError(ErrorCode error) {
   CloseChannels();
   SetState(FAILED, error);
 }
 
 void ConnectionToHost::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
   clipboard_forwarder_.set_clipboard_stub(NULL);
   event_forwarder_.set_input_stub(NULL);
   video_reader_.reset();
+  audio_reader_.reset();
 }
 
 void ConnectionToHost::SetState(State state, ErrorCode error) {
   DCHECK(CalledOnValidThread());
   // |error| should be specified only when |state| is set to FAILED.
   DCHECK(state == FAILED || error == OK);
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting