Make cricket::VideoCapturer implement VideoSourceInterface

talk/media/base/capturerenderadapter.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 20 matching lines @@
 #include "talk/media/base/videorenderer.h"
 #include "webrtc/base/logging.h"
 
 namespace cricket {
 
 CaptureRenderAdapter::CaptureRenderAdapter(VideoCapturer* video_capturer)
     : video_capturer_(video_capturer) {
 }
 
 CaptureRenderAdapter::~CaptureRenderAdapter() {
-  // Since the signal we're connecting to is multi-threaded,
-  // disconnect_all() will block until all calls are serviced, meaning any
-  // outstanding calls to OnVideoFrame will be done when this is done, and no
-  // more calls will be serviced by this.
-  // We do this explicitly instead of just letting the has_slots<> destructor
-  // take care of it because we need to do this *before* sinks_ is
-  // cleared by the destructor; otherwise we could mess with it while
-  // OnVideoFrame is running.
-  // We *don't* take capture_crit_ here since it could deadlock with the lock
-  // taken by the video frame signal.
-  disconnect_all();
+  video_capturer_->RemoveSink(this);
 }
 
 CaptureRenderAdapter* CaptureRenderAdapter::Create(
     VideoCapturer* video_capturer) {
   if (!video_capturer) {
     return NULL;
   }
   CaptureRenderAdapter* return_value = new CaptureRenderAdapter(video_capturer);
   return_value->Init();  // Can't fail.
   return return_value;
@@ skipping 12 matching lines @@
 
 void CaptureRenderAdapter::RemoveSink(
     rtc::VideoSinkInterface<VideoFrame>* sink) {
   RTC_DCHECK(sink);
 
   rtc::CritScope cs(&capture_crit_);
   sinks_.erase(std::remove(sinks_.begin(), sinks_.end(), sink), sinks_.end());
 }
 
 void CaptureRenderAdapter::Init() {
-  video_capturer_->SignalVideoFrame.connect(
-      this,
-      &CaptureRenderAdapter::OnVideoFrame);
+  rtc::VideoSinkCapabilities capabilities;
+  // All renderers must handle rotation.
+  capabilities.can_apply_rotation = true;
+
+  video_capturer_->AddSink(this, capabilities);
 }
 
-void CaptureRenderAdapter::OnVideoFrame(VideoCapturer* capturer,
-                                        const VideoFrame* video_frame) {
+void CaptureRenderAdapter::OnFrame(const VideoFrame& frame) {
   rtc::CritScope cs(&capture_crit_);
   if (sinks_.empty()) {

[nisse-webrtc, 2016/02/03 09:16:34]

This test isn't needed, right?

[perkj_webrtc, 2016/02/08 14:32:00]

Done.

     return;
   }
 
   for (auto* sink : sinks_)
-    sink->OnFrame(*video_frame);
+    sink->OnFrame(frame);
 }
 
 }  // namespace cricket