Interface with webrtc through encoded frames

remoting/protocol/webrtc_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/webrtc_connection_to_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "net/base/io_buffer.h"
 #include "remoting/codec/video_encoder.h"
 #include "remoting/codec/video_encoder_verbatim.h"
 #include "remoting/codec/video_encoder_vpx.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/input_stub.h"
 #include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/webrtc_transport.h"
-#include "remoting/protocol/webrtc_video_capturer_adapter.h"
 #include "remoting/protocol/webrtc_video_stream.h"
 #include "third_party/webrtc/api/mediastreaminterface.h"
 #include "third_party/webrtc/api/peerconnectioninterface.h"
 #include "third_party/webrtc/api/test/fakeconstraints.h"
 
 namespace remoting {
 namespace protocol {
 
 // Currently the network thread is also used as worker thread for webrtc.
 //
 // TODO(sergeyu): Figure out if we would benefit from using a separate
 // thread as a worker thread.
 WebrtcConnectionToClient::WebrtcConnectionToClient(
     scoped_ptr<protocol::Session> session,
-    scoped_refptr<protocol::TransportContext> transport_context)
-    : transport_(jingle_glue::JingleThreadWrapper::current(),
-                 transport_context,
-                 this),
+    scoped_refptr<protocol::TransportContext> transport_context,
+    scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner)
+    : transport_(
+          new WebrtcTransport(jingle_glue::JingleThreadWrapper::current(),
+                              transport_context,
+                              this)),
       session_(std::move(session)),
+      video_encode_task_runner_(video_encode_task_runner),
       control_dispatcher_(new HostControlDispatcher()),
       event_dispatcher_(new HostEventDispatcher()) {
   session_->SetEventHandler(this);
-  session_->SetTransport(&transport_);
+  session_->SetTransport(transport_.get());
 }
 
 WebrtcConnectionToClient::~WebrtcConnectionToClient() {}
 
 void WebrtcConnectionToClient::SetEventHandler(
     ConnectionToClient::EventHandler* event_handler) {
   DCHECK(thread_checker_.CalledOnValidThread());
   event_handler_ = event_handler;
 }
 
@@ skipping 10 matching lines @@
   session_->Close(error);
 }
 
 void WebrtcConnectionToClient::OnInputEventReceived(int64_t timestamp) {
   DCHECK(thread_checker_.CalledOnValidThread());
   event_handler_->OnInputEventReceived(this, timestamp);
 }
 
 scoped_ptr<VideoStream> WebrtcConnectionToClient::StartVideoStream(
     scoped_ptr<webrtc::DesktopCapturer> desktop_capturer) {
+  // TODO(isheriff): make this codec independent
+  scoped_ptr<VideoEncoder> video_encoder = VideoEncoderVpx::CreateForVP8();
   scoped_ptr<WebrtcVideoStream> stream(new WebrtcVideoStream());
-  if (!stream->Start(std::move(desktop_capturer), transport_.peer_connection(),
-                     transport_.peer_connection_factory())) {
+  if (!stream->Start(std::move(desktop_capturer), transport_.get(),
+                     video_encode_task_runner_, std::move(video_encoder))) {
     return nullptr;
   }
   return std::move(stream);
-
 }
 
 AudioStub* WebrtcConnectionToClient::audio_stub() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return nullptr;
 }
 
 // Return pointer to ClientStub.
 ClientStub* WebrtcConnectionToClient::client_stub() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 13 matching lines @@
 
 void WebrtcConnectionToClient::set_input_stub(protocol::InputStub* input_stub) {
   DCHECK(thread_checker_.CalledOnValidThread());
   event_dispatcher_->set_input_stub(input_stub);
 }
 
 void WebrtcConnectionToClient::OnSessionStateChange(Session::State state) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   DCHECK(event_handler_);
-  switch(state) {
+  switch (state) {
     case Session::INITIALIZING:
     case Session::CONNECTING:
     case Session::ACCEPTING:
     case Session::ACCEPTED:
       // Don't care about these events.
       break;
     case Session::AUTHENTICATING:
       event_handler_->OnConnectionAuthenticating(this);
       break;
     case Session::AUTHENTICATED:
       event_handler_->OnConnectionAuthenticated(this);
       break;
     case Session::CLOSED:
     case Session::FAILED:
+      transport_->Close(state == Session::CLOSED ? OK : session_->error());
       control_dispatcher_.reset();
       event_dispatcher_.reset();
       event_handler_->OnConnectionClosed(
           this, state == Session::CLOSED ? OK : session_->error());
       break;
   }
 }
 
 void WebrtcConnectionToClient::OnWebrtcTransportConnecting() {
-  control_dispatcher_->Init(transport_.outgoing_channel_factory(), this);
+  control_dispatcher_->Init(transport_->outgoing_channel_factory(), this);
 
-  event_dispatcher_->Init(transport_.incoming_channel_factory(), this);
+  event_dispatcher_->Init(transport_->incoming_channel_factory(), this);
   event_dispatcher_->set_on_input_event_callback(base::Bind(
       &ConnectionToClient::OnInputEventReceived, base::Unretained(this)));
 }
 
 void WebrtcConnectionToClient::OnWebrtcTransportConnected() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void WebrtcConnectionToClient::OnWebrtcTransportError(ErrorCode error) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 13 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (control_dispatcher_ && control_dispatcher_->is_connected() &&
       event_dispatcher_ && event_dispatcher_->is_connected()) {
     event_handler_->OnConnectionChannelsConnected(this);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting