Make cricket::VideoCapturer implement VideoSourceInterface

talk/media/base/videocapturer.cc

 /*
  * libjingle
  * Copyright 2010 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 332 matching lines @@
 void VideoCapturer::OnFrameCaptured(VideoCapturer*,
                                     const CapturedFrame* captured_frame) {
   if (muted_) {
     if (black_frame_count_down_ == 0) {
       thread_->Post(this, MSG_DO_PAUSE, NULL);
     } else {
       --black_frame_count_down_;
     }
   }
 
-  if (SignalVideoFrame.is_empty()) {
+  if (SignalVideoFrame.is_empty() && !HasSinks()) {
     return;
   }
 
   // Use a temporary buffer to scale
   rtc::scoped_ptr<uint8_t[]> scale_buffer;
 
   if (IsScreencast()) {
     int scaled_width, scaled_height;
     int desired_screencast_fps = capture_format_.get() ?
       VideoFormat::IntervalToFps(capture_format_->interval) :
@@ skipping 162 matching lines @@
     LOG(LS_ERROR) << "Couldn't convert to I420! "
                   << "From " << ToString(captured_frame) << " To "
                   << cropped_width << " x " << cropped_height;
     return;
   }
 
   if (muted_) {
     // TODO(pthatcher): Use frame_factory_->CreateBlackFrame() instead.
     adapted_frame->SetToBlack();
   }
+  DeliverFrame(adapted_frame.get());
   SignalVideoFrame(this, adapted_frame.get());

[pthatcher, 2016/02/01 18:40:54]

We should leave a comment about how we fire both while we're transitioning from
one to the other (from SignalVideoFrame to DeliverFrame).

[perkj_webrtc, 2016/02/02 16:24:00]

SignalVideoFrame now removed. I was just not done yesterday.

 
   UpdateStats(captured_frame);
 }
 
 void VideoCapturer::SetCaptureState(CaptureState state) {
   if (state == capture_state_) {
     // Don't trigger a state changed callback if the state hasn't changed.
     return;
   }
   StateChangeParams* state_params = new StateChangeParams(state);
@@ skipping 172 matching lines @@
 void VideoCapturer::GetVariableSnapshot(
     const rtc::RollingAccumulator<T>& data,
     VariableInfo<T>* stats) {
   stats->max_val = data.ComputeMax();
   stats->mean = data.ComputeMean();
   stats->min_val = data.ComputeMin();
   stats->variance = data.ComputeVariance();
 }
 
 }  // namespace cricket