Piping for audio decoding.

remoting/client/plugin/chromoting_instance.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/client/plugin/chromoting_instance.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 10 matching lines @@
 #include "base/values.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "media/base/media.h"
 #include "net/socket/ssl_server_socket.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/mouse_cursor.h"
 #include "ppapi/cpp/rect.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/util.h"
+#include "remoting/client/audio_decode_scheduler.h"
 #include "remoting/client/client_config.h"
 #include "remoting/client/chromoting_client.h"
 #include "remoting/client/frame_consumer_proxy.h"
 #include "remoting/client/plugin/pepper_audio_player.h"
 #include "remoting/client/plugin/pepper_input_handler.h"
 #include "remoting/client/plugin/pepper_port_allocator.h"
 #include "remoting/client/plugin/pepper_view.h"
 #include "remoting/client/plugin/pepper_xmpp_proxy.h"
 #include "remoting/client/rectangle_update_decoder.h"
 #include "remoting/protocol/connection_to_host.h"
@@ skipping 422 matching lines @@
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
   PostChromotingMessage("onFirstFrameReceived", data.Pass());
 }
 
 void ChromotingInstance::Connect(const ClientConfig& config) {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
 
   jingle_glue::JingleThreadWrapper::EnsureForCurrentThread();
 
   host_connection_.reset(new protocol::ConnectionToHost(true));
-  audio_player_.reset(new PepperAudioPlayer(this));
-  client_.reset(new ChromotingClient(config, context_.main_task_runner(),
+  scoped_ptr<AudioPlayer> audio_player(new PepperAudioPlayer(this));
+  client_.reset(new ChromotingClient(config, context_,
                                      host_connection_.get(), this,
                                      rectangle_decoder_.get(),
-                                     audio_player_.get()));
+                                     audio_player.Pass()));
 
   // Construct the input pipeline
   mouse_input_filter_.reset(
       new protocol::MouseInputFilter(host_connection_->input_stub()));
   mouse_input_filter_->set_input_size(view_->get_view_size_dips());
   input_tracker_.reset(
       new protocol::InputEventTracker(mouse_input_filter_.get()));
 
 #if defined(OS_MACOSX)
   // On Mac we need an extra filter to inject missing keyup events.
@@ skipping 41 matching lines @@
     base::WaitableEvent done_event(true, false);
     client_->Stop(base::Bind(&base::WaitableEvent::Signal,
                              base::Unretained(&done_event)));
     done_event.Wait();
     client_.reset();
   }
 
   input_handler_.reset();
   input_tracker_.reset();
   mouse_input_filter_.reset();
-  audio_player_.reset();
+  audio_decode_scheduler_.reset();
   host_connection_.reset();
 }
 
 void ChromotingInstance::OnIncomingIq(const std::string& iq) {
   xmpp_proxy_->OnIq(iq);
 }
 
 void ChromotingInstance::ReleaseAllKeys() {
   if (IsConnected())
     input_tracker_->ReleaseAll();
@@ skipping 197 matching lines @@
   PostChromotingMessage("logDebugMessage", data.Pass());
   g_logging_to_plugin = false;
 }
 
 bool ChromotingInstance::IsConnected() {
   return host_connection_.get() &&
     (host_connection_->state() == protocol::ConnectionToHost::CONNECTED);
 }
 
 }  // namespace remoting