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 225 matching lines @@
     black_frame_count_down_ = kNumBlackFramesOnMute;
     // Following frames will be overritten with black, then the camera will be
     // paused.
     return true;
   }
   // Start the camera.
   thread_->Clear(this, MSG_DO_PAUSE);
   return Pause(false);
 }
 
-// Note that the last caller decides whether rotation should be applied if there
-// are multiple send streams using the same camera.
-bool VideoCapturer::SetApplyRotation(bool enable) {
-  apply_rotation_ = enable;
+void VideoCapturer::OnSinkCapabilitiesChanged(
+    const rtc::VideoSinkCapabilities& capabilities) {
+  apply_rotation_ = !capabilities.can_apply_rotation;

[pthatcher1, 2016/02/03 15:38:35]

I like this a lot.

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

Acknowledged.

   if (frame_factory_) {
     frame_factory_->SetApplyRotation(apply_rotation_);
   }
-  return true;
 }
 
 void VideoCapturer::SetSupportedFormats(
     const std::vector<VideoFormat>& formats) {
   supported_formats_ = formats;
   UpdateFilteredSupportedFormats();
 }
 
 bool VideoCapturer::GetBestCaptureFormat(const VideoFormat& format,
                                          VideoFormat* best_format) {
@@ skipping 79 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 (!HasSinks()) {

[pthatcher1, 2016/02/03 15:38:35]

We could make this more generic as something like FrameWorthDelivering().  Then,
in the future when all the sinks are muted in some way (have maxFps = 0), then
we wouldn't produce a frame.

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

Done.

     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();
   }
-  SignalVideoFrame(this, adapted_frame.get());
-
+  DeliverFrameToSinks(*adapted_frame.get());
   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);
   capture_state_ = state;
@@ skipping 171 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