Move audio decoding to protocol layer

remoting/client/chromoting_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/client/chromoting_client.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "remoting/base/capabilities.h"
 #include "remoting/base/constants.h"
-#include "remoting/client/audio_consumer.h"
-#include "remoting/client/audio_decode_scheduler.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/client_user_interface.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/ice_connection_to_host.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/negotiating_client_authenticator.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/video_renderer.h"
 #include "remoting/protocol/webrtc_connection_to_host.h"
 #include "remoting/signaling/jid_util.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace remoting {
 
-ChromotingClient::ChromotingClient(ClientContext* client_context,
-                                   ClientUserInterface* user_interface,
-                                   protocol::VideoRenderer* video_renderer,
-                                   base::WeakPtr<AudioConsumer> audio_consumer)
+ChromotingClient::ChromotingClient(
+    ClientContext* client_context,
+    ClientUserInterface* user_interface,
+    protocol::VideoRenderer* video_renderer,
+    base::WeakPtr<protocol::AudioStub> audio_consumer)
     : user_interface_(user_interface), video_renderer_(video_renderer) {
   DCHECK(client_context->main_task_runner()->BelongsToCurrentThread());
-  if (audio_consumer) {
-    audio_decode_scheduler_.reset(new AudioDecodeScheduler(
-        client_context->main_task_runner(),
-        client_context->audio_decode_task_runner(), audio_consumer));
-  }
+
+  audio_decode_task_runner_ = client_context->audio_decode_task_runner();
+  audio_consumer_ = audio_consumer;
 }
 
 ChromotingClient::~ChromotingClient() {
   if (signal_strategy_)
       signal_strategy_->RemoveListener(this);
 }
 
 void ChromotingClient::set_protocol_config(
     std::unique_ptr<protocol::CandidateSessionConfig> config) {
   protocol_config_ = std::move(config);
@@ skipping 11 matching lines @@
     const std::string& host_jid,
     const std::string& capabilities) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!session_manager_);  // Start must be called more than once.
 
   host_jid_ = NormalizeJid(host_jid);
   local_capabilities_ = capabilities;
 
   if (!protocol_config_)
     protocol_config_ = protocol::CandidateSessionConfig::CreateDefault();
-  if (!audio_decode_scheduler_)
+  if (!audio_consumer_)
     protocol_config_->DisableAudioChannel();
 
   if (!connection_) {
     if (protocol_config_->webrtc_supported()) {
       DCHECK(!protocol_config_->ice_supported());
 #if !defined(ENABLE_WEBRTC_REMOTING_CLIENT)
       LOG(FATAL) << "WebRTC is not supported.";
 #else
       connection_.reset(new protocol::WebrtcConnectionToHost());
 #endif
     } else {
       DCHECK(protocol_config_->ice_supported());
       connection_.reset(new protocol::IceConnectionToHost());
     }
   }
   connection_->set_client_stub(this);
   connection_->set_clipboard_stub(this);
   connection_->set_video_renderer(video_renderer_);
-  connection_->set_audio_stub(audio_decode_scheduler_.get());
+
+  connection_->InitializeAudio(audio_decode_task_runner_, audio_consumer_);
 
   session_manager_.reset(new protocol::JingleSessionManager(signal_strategy));
   session_manager_->set_protocol_config(std::move(protocol_config_));
 
   client_auth_config_ = client_auth_config;
   transport_context_ = transport_context;
 
   signal_strategy_ = signal_strategy;
   signal_strategy_->AddListener(this);
 
@@ skipping 89 matching lines @@
 
   user_interface_->GetCursorShapeStub()->SetCursorShape(cursor_shape);
 }
 
 void ChromotingClient::OnConnectionState(
     protocol::ConnectionToHost::State state,
     protocol::ErrorCode error) {
   DCHECK(thread_checker_.CalledOnValidThread());
   VLOG(1) << "ChromotingClient::OnConnectionState(" << state << ")";
 
-  if (state == protocol::ConnectionToHost::AUTHENTICATED) {
-    OnAuthenticated();
-  } else if (state == protocol::ConnectionToHost::CONNECTED) {
+  if (state == protocol::ConnectionToHost::CONNECTED) {
     OnChannelsConnected();
   }
   user_interface_->OnConnectionState(state, error);
 }
 
 void ChromotingClient::OnConnectionReady(bool ready) {
   VLOG(1) << "ChromotingClient::OnConnectionReady(" << ready << ")";
   user_interface_->OnConnectionReady(ready);
 }
 
@@ skipping 31 matching lines @@
 void ChromotingClient::StartConnection() {
   DCHECK(thread_checker_.CalledOnValidThread());
   connection_->Connect(
       session_manager_->Connect(
           host_jid_, base::MakeUnique<protocol::NegotiatingClientAuthenticator>(
                          NormalizeJid(signal_strategy_->GetLocalJid()),
                          host_jid_, client_auth_config_)),
       transport_context_, this);
 }
 
-void ChromotingClient::OnAuthenticated() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  // Initialize the decoder.
-  if (connection_->config().is_audio_enabled())
-    audio_decode_scheduler_->Initialize(connection_->config());
-}
-
 void ChromotingClient::OnChannelsConnected() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Negotiate capabilities with the host.
   VLOG(1) << "Client capabilities: " << local_capabilities_;
 
   protocol::Capabilities capabilities;
   capabilities.set_capabilities(local_capabilities_);
   connection_->host_stub()->SetCapabilities(capabilities);
 
   mouse_input_scaler_.set_input_stub(connection_->input_stub());
 }
 
 }  // namespace remoting