Implement missing features in WebrtcVideoStream.

remoting/protocol/webrtc_video_capturer_adapter.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_video_capturer_adapter.h"
 
 #include <utility>
 
 #include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoframe.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 
 namespace remoting {
 namespace protocol {
 
 // Number of frames to be captured per second.
 const int kFramesPerSec = 30;
 
 WebrtcVideoCapturerAdapter::WebrtcVideoCapturerAdapter(
     scoped_ptr<webrtc::DesktopCapturer> capturer)
-    : desktop_capturer_(std::move(capturer)) {
+    : desktop_capturer_(std::move(capturer)), weak_factory_(this) {
   DCHECK(desktop_capturer_);
 
   // Disable video adaptation since we don't intend to use it.
   set_enable_video_adapter(false);
 }
 
 WebrtcVideoCapturerAdapter::~WebrtcVideoCapturerAdapter() {
   DCHECK(!capture_timer_);
 }
 
+void WebrtcVideoCapturerAdapter::SetSizeCallback(
+    const SizeCallback& size_callback) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  size_callback_ = size_callback;
+}
+
+base::WeakPtr<WebrtcVideoCapturerAdapter>
+WebrtcVideoCapturerAdapter::GetWeakPtr() {
+  return weak_factory_.GetWeakPtr();
+}
+
 bool WebrtcVideoCapturerAdapter::GetBestCaptureFormat(
     const cricket::VideoFormat& desired,
     cricket::VideoFormat* best_format) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // The |capture_format| passed to Start() is always ignored, so copy
   // |best_format| to |desired_format|.
   *best_format = desired;
   return true;
 }
@@ skipping 111 matching lines @@
   scoped_ptr<webrtc::DesktopFrame> owned_frame(frame);
 
   // Drop the frame if there were no changes.
   if (!owned_frame || owned_frame->updated_region().is_empty())
     return;
 
   size_t width = frame->size().width();
   size_t height = frame->size().height();
   if (!yuv_frame_ || yuv_frame_->GetWidth() != width ||
       yuv_frame_->GetHeight() != height) {
+    if (!size_callback_.is_null())
+      size_callback_.Run(frame->size());
+
     scoped_ptr<cricket::WebRtcVideoFrame> webrtc_frame(
         new cricket::WebRtcVideoFrame());
     webrtc_frame->InitToEmptyBuffer(width, height, 1, 1, 0);
     yuv_frame_ = std::move(webrtc_frame);
 
     // Set updated_region so the whole frame is converted to YUV below.
     frame->mutable_updated_region()->SetRect(
         webrtc::DesktopRect::MakeWH(width, height));
   }
 
@@ skipping 40 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (capture_pending_)
     return;
   capture_pending_ = true;
   desktop_capturer_->Capture(webrtc::DesktopRegion());
 }
 
 }  // namespace protocol
 }  // namespace remoting