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

Unified Diff: remoting/protocol/connection_to_client.cc

Issue 10532211: Added piping for sending audio packets from host to client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 years, 6 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/protocol/connection_to_client.cc
diff --git a/remoting/protocol/connection_to_client.cc b/remoting/protocol/connection_to_client.cc
index 03ee1fec34bf4da5915c2a05a5a0451352f64e6e..f87738347a9bd13e69098b439a785e8a71c73e8f 100644
--- a/remoting/protocol/connection_to_client.cc
+++ b/remoting/protocol/connection_to_client.cc
@@ -68,6 +68,11 @@ VideoStub* ConnectionToClient::video_stub() {
return video_writer_.get();
}
+AudioStub* ConnectionToClient::audio_stub() {
+ DCHECK(CalledOnValidThread());
+ return audio_writer_.get();
+}
+
// Return pointer to ClientStub.
ClientStub* ConnectionToClient::client_stub() {
DCHECK(CalledOnValidThread());
@@ -120,6 +125,12 @@ void ConnectionToClient::OnSessionStateChange(Session::State state) {
video_writer_->Init(session_.get(), base::Bind(
&ConnectionToClient::OnChannelInitialized, base::Unretained(this)));
+ if (AudioEnabled()) {
+ audio_writer_ = AudioWriter::Create(session_->config());
+ 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);
@@ -158,7 +169,9 @@ void ConnectionToClient::NotifyIfChannelsReady() {
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() &&
+ (!AudioEnabled() ||
+ (audio_writer_.get() && audio_writer_->is_connected()))) {
handler_->OnConnectionChannelsConnected(this);
}
}
@@ -172,6 +185,12 @@ void ConnectionToClient::CloseChannels() {
control_dispatcher_.reset();
event_dispatcher_.reset();
video_writer_.reset();
+ audio_writer_.reset();
+}
+
+bool ConnectionToClient::AudioEnabled() {
Sergey Ulanov 2012/06/21 18:36:04 Actually it's better to call it is_audio_enabled()
kxing 2012/06/21 18:53:28 Done.
+ return (session_->config().audio_config().transport !=
Sergey Ulanov 2012/06/21 18:36:04 nit: don't need parenthesis here.
kxing 2012/06/21 18:53:28 Done.
+ ChannelConfig::TRANSPORT_NONE);
}
} // namespace protocol

Powered by Google App Engine
This is Rietveld 408576698