Remove dependency on AudioStub in ConnectionToClient

remoting/protocol/ice_connection_to_client.cc

 // Copyright 2015 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/ice_connection_to_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "net/base/io_buffer.h"
+#include "remoting/codec/audio_encoder.h"
+#include "remoting/codec/audio_encoder_opus.h"
+#include "remoting/codec/audio_encoder_verbatim.h"
 #include "remoting/codec/video_encoder.h"
+#include "remoting/protocol/audio_pump.h"
+#include "remoting/protocol/audio_source.h"
 #include "remoting/protocol/audio_writer.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/host_control_dispatcher.h"
 #include "remoting/protocol/host_event_dispatcher.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/host_video_dispatcher.h"
 #include "remoting/protocol/input_stub.h"
 #include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/video_frame_pump.h"
 
 namespace remoting {
 namespace protocol {
 
+namespace {
+
+std::unique_ptr<AudioEncoder> CreateAudioEncoder(
+    const protocol::SessionConfig& config) {
+  const protocol::ChannelConfig& audio_config = config.audio_config();
+
+  if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {

[Jamie, 2016/08/17 18:17:30]

Do we still need to support VERBATIM outside of tests? even if not, removing it
can be a separate CL, but it would be nice to clean it up.

[Sergey Ulanov, 2016/08/18 00:32:56]

Removed verbatim audio codec in this CL. (verbatim video is still used in
tests).

+    return base::WrapUnique(new AudioEncoderVerbatim());
+  } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
+    return base::WrapUnique(new AudioEncoderOpus());
+  }
+
+  NOTREACHED();
+  return nullptr;
+}
+
+}  // namespace
+
 IceConnectionToClient::IceConnectionToClient(
     std::unique_ptr<protocol::Session> session,
     scoped_refptr<TransportContext> transport_context,
-    scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner)
+    scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner)
     : event_handler_(nullptr),
       session_(std::move(session)),
       video_encode_task_runner_(video_encode_task_runner),
+      audio_task_runner_(audio_task_runner),
       transport_(transport_context, this),
       control_dispatcher_(new HostControlDispatcher()),
       event_dispatcher_(new HostEventDispatcher()),
       video_dispatcher_(new HostVideoDispatcher()) {
   session_->SetEventHandler(this);
   session_->SetTransport(&transport_);
 }
 
 IceConnectionToClient::~IceConnectionToClient() {}
 
@@ skipping 28 matching lines @@
   std::unique_ptr<VideoEncoder> video_encoder =
       VideoEncoder::Create(session_->config());
 
   std::unique_ptr<VideoFramePump> pump(
       new VideoFramePump(video_encode_task_runner_, std::move(desktop_capturer),
                          std::move(video_encoder), video_dispatcher_.get()));
   video_dispatcher_->set_video_feedback_stub(pump->video_feedback_stub());
   return std::move(pump);
 }
 
-AudioStub* IceConnectionToClient::audio_stub() {
+std::unique_ptr<AudioSendStream> IceConnectionToClient::StartAudioStream(
+    std::unique_ptr<AudioSource> audio_source) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  return audio_writer_.get();
+
+  // Audio channel is disabled.
+  if (!audio_writer_)
+    return nullptr;
+
+  std::unique_ptr<AudioEncoder> audio_encoder =
+      CreateAudioEncoder(session_->config());
+
+  return base::WrapUnique(
+      new AudioPump(audio_task_runner_, std::move(audio_source),
+                    std::move(audio_encoder), audio_writer_.get()));
 }
 
+
 // Return pointer to ClientStub.
 ClientStub* IceConnectionToClient::client_stub() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return control_dispatcher_.get();
 }
 
 void IceConnectionToClient::set_clipboard_stub(
     protocol::ClipboardStub* clipboard_stub) {
   DCHECK(thread_checker_.CalledOnValidThread());
   control_dispatcher_->set_clipboard_stub(clipboard_stub);
@@ skipping 86 matching lines @@
     return;
   if (!event_dispatcher_ || !event_dispatcher_->is_connected())
     return;
   if (!video_dispatcher_ || !video_dispatcher_->is_connected())
     return;
   if ((!audio_writer_ || !audio_writer_->is_connected()) &&
       session_->config().is_audio_enabled()) {
     return;
   }
   event_handler_->OnConnectionChannelsConnected(this);
-  event_handler_->CreateVideoStreams(this);
+  event_handler_->CreateMediaStreams(this);
 }
 
 void IceConnectionToClient::CloseChannels() {
   control_dispatcher_.reset();
   event_dispatcher_.reset();
   video_dispatcher_.reset();
   audio_writer_.reset();
 }
 
 }  // namespace protocol
 }  // namespace remoting