Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 10843031: Piping for audio decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed an #include to a forward declaration Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index b58bea2267c0775e52b4e2879a305cfd0a446926..ff75baa883db7cc6d477c742f997cc11cc0b7317 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -28,6 +28,7 @@
#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"
@@ -470,11 +471,11 @@ void ChromotingInstance::Connect(const ClientConfig& config) {
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(
@@ -536,7 +537,7 @@ void ChromotingInstance::Disconnect() {
input_handler_.reset();
input_tracker_.reset();
mouse_input_filter_.reset();
- audio_player_.reset();
+ audio_decode_scheduler_.reset();
host_connection_.reset();
}

Powered by Google App Engine
This is Rietveld 408576698