Implement missing features in WebrtcVideoStream.

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"
@@ skipping 13 matching lines @@
 #include "remoting/protocol/webrtc_video_capturer_adapter.h"
 #include "remoting/protocol/webrtc_video_stream.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h"
 #include "third_party/libjingle/source/talk/app/webrtc/test/fakeconstraints.h"
 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
 
 namespace remoting {
 namespace protocol {
 
-const char kStreamLabel[] = "screen_stream";
-const char kVideoLabel[] = "screen_video";
-
 // 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),
@@ skipping 25 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) {
-  scoped_ptr<WebrtcVideoCapturerAdapter> video_capturer_adapter(
-      new WebrtcVideoCapturerAdapter(std::move(desktop_capturer)));
-
-  // Set video stream constraints.
-  webrtc::FakeConstraints video_constraints;
-  video_constraints.AddMandatory(
-      webrtc::MediaConstraintsInterface::kMinFrameRate, 5);
-
-  rtc::scoped_refptr<webrtc::VideoTrackInterface> video_track =
-      transport_.peer_connection_factory()->CreateVideoTrack(
-          kVideoLabel,
-          transport_.peer_connection_factory()->CreateVideoSource(
-              video_capturer_adapter.release(), &video_constraints));
-
-  rtc::scoped_refptr<webrtc::MediaStreamInterface> video_stream =
-      transport_.peer_connection_factory()->CreateLocalMediaStream(
-          kStreamLabel);
-
-  if (!video_stream->AddTrack(video_track) ||
-      !transport_.peer_connection()->AddStream(video_stream)) {
+  scoped_ptr<WebrtcVideoStream> stream(new WebrtcVideoStream());
+  if (!stream->Start(std::move(desktop_capturer), transport_.peer_connection(),
+                     transport_.peer_connection_factory())) {
     return nullptr;
   }
+  return std::move(stream);
 
-  return make_scoped_ptr(
-      new WebrtcVideoStream(transport_.peer_connection(), video_stream));
 }
 
 AudioStub* WebrtcConnectionToClient::audio_stub() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return nullptr;
 }
 
 // Return pointer to ClientStub.
 ClientStub* WebrtcConnectionToClient::client_stub() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 71 matching lines @@
     ErrorCode error) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   LOG(ERROR) << "Failed to connect channel "
              << channel_dispatcher->channel_name();
   Disconnect(error);
 }
 
 }  // namespace protocol
 }  // namespace remoting