Make cricket::VideoCapturer implement VideoSourceInterface

talk/media/webrtc/webrtcvideoengine2.cc

 /*
  * libjingle
  * Copyright 2014 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 1000 matching lines @@
   if (enable && options) {
     VideoSendParameters new_params = send_params_;
     new_params.options.SetAll(*options);
     SetSendParameters(send_params_);
   }
   return true;
 }
 
 bool WebRtcVideoChannel2::ValidateSendSsrcAvailability(
     const StreamParams& sp) const {
-  for (uint32_t ssrc: sp.ssrcs) {
+  for (uint32_t ssrc : sp.ssrcs) {

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

Unrelated change.

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

yes. git cl format, git cl lint.

     if (send_ssrcs_.find(ssrc) != send_ssrcs_.end()) {
       LOG(LS_ERROR) << "Send stream with SSRC '" << ssrc << "' already exists.";
       return false;
     }
   }
   return true;
 }
 
 bool WebRtcVideoChannel2::ValidateReceiveSsrcAvailability(
     const StreamParams& sp) const {
-  for (uint32_t ssrc: sp.ssrcs) {
+  for (uint32_t ssrc : sp.ssrcs) {
     if (receive_ssrcs_.find(ssrc) != receive_ssrcs_.end()) {
       LOG(LS_ERROR) << "Receive stream with SSRC '" << ssrc
                     << "' already exists.";
       return false;
     }
   }
   return true;
 }
 
 bool WebRtcVideoChannel2::AddSendStream(const StreamParams& sp) {
@@ skipping 285 matching lines @@
   {
     rtc::CritScope stream_lock(&stream_crit_);
     if (send_streams_.find(ssrc) == send_streams_.end()) {
       LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc;
       return false;
     }
     if (!send_streams_[ssrc]->SetCapturer(capturer)) {
       return false;
     }
   }
-
-  if (capturer) {
-    capturer->SetApplyRotation(!ContainsHeaderExtension(
-        send_rtp_extensions_, kRtpVideoRotationHeaderExtension));
-  }
   {
     rtc::CritScope lock(&capturer_crit_);
     capturers_[ssrc] = capturer;
   }
   return true;
 }
 
 bool WebRtcVideoChannel2::SendIntraFrame() {
   // TODO(pbos): Implement.
   LOG(LS_VERBOSE) << "SendIntraFrame().";
@@ skipping 263 matching lines @@
   video_frame->CreateEmptyFrame(width, height, width, (width + 1) / 2,
                                 (width + 1) / 2);
   memset(video_frame->buffer(webrtc::kYPlane), 16,
          video_frame->allocated_size(webrtc::kYPlane));
   memset(video_frame->buffer(webrtc::kUPlane), 128,
          video_frame->allocated_size(webrtc::kUPlane));
   memset(video_frame->buffer(webrtc::kVPlane), 128,
          video_frame->allocated_size(webrtc::kVPlane));
 }
 
-void WebRtcVideoChannel2::WebRtcVideoSendStream::InputFrame(
-    VideoCapturer* capturer,
-    const VideoFrame* frame) {
-  TRACE_EVENT0("webrtc", "WebRtcVideoSendStream::InputFrame");
-  webrtc::VideoFrame video_frame(frame->GetVideoFrameBuffer(), 0, 0,
-                                 frame->GetVideoRotation());
+void WebRtcVideoChannel2::WebRtcVideoSendStream::OnFrame(
+    const VideoFrame& frame) {
+  TRACE_EVENT0("webrtc", "WebRtcVideoSendStream::OnFrame");
+  webrtc::VideoFrame video_frame(frame.GetVideoFrameBuffer(), 0, 0,
+                                 frame.GetVideoRotation());
   rtc::CritScope cs(&lock_);
   if (stream_ == NULL) {
     // Frame input before send codecs are configured, dropping frame.
     return;
   }
 
   // Not sending, abort early to prevent expensive reconfigurations while
   // setting up codecs etc.
   if (!sending_)
     return;
 
   if (format_.width == 0) {  // Dropping frames.
     RTC_DCHECK(format_.height == 0);
     LOG(LS_VERBOSE) << "VideoFormat 0x0 set, Dropping frame.";
     return;
   }
   if (muted_) {
     // Create a black frame to transmit instead.
-    CreateBlackFrame(&video_frame,
-                     static_cast<int>(frame->GetWidth()),
-                     static_cast<int>(frame->GetHeight()));
+    CreateBlackFrame(&video_frame, static_cast<int>(frame.GetWidth()),
+                     static_cast<int>(frame.GetHeight()));
   }
 
-  int64_t frame_delta_ms = frame->GetTimeStamp() / rtc::kNumNanosecsPerMillisec;
+  int64_t frame_delta_ms = frame.GetTimeStamp() / rtc::kNumNanosecsPerMillisec;
   // frame->GetTimeStamp() is essentially a delta, align to webrtc time
   if (first_frame_timestamp_ms_ == 0) {
     first_frame_timestamp_ms_ = rtc::Time() - frame_delta_ms;
   }
 
   last_frame_timestamp_ms_ = first_frame_timestamp_ms_ + frame_delta_ms;
   video_frame.set_render_time_ms(last_frame_timestamp_ms_);
   // Reconfigure codec if necessary.
-  SetDimensions(
-      video_frame.width(), video_frame.height(), capturer->IsScreencast());
+  SetDimensions(video_frame.width(), video_frame.height(),
+                capturer_->IsScreencast());
 
   stream_->Input()->IncomingCapturedFrame(video_frame);
 }
 
 bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetCapturer(
     VideoCapturer* capturer) {
   TRACE_EVENT0("webrtc", "WebRtcVideoSendStream::SetCapturer");
   if (!DisconnectCapturer() && capturer == NULL) {
     return false;
   }
@@ skipping 22 matching lines @@
             format_.interval / rtc::kNumNanosecsPerMillisec;
         black_frame.set_render_time_ms(last_frame_timestamp_ms_);
         stream_->Input()->IncomingCapturedFrame(black_frame);
       }
 
       capturer_ = NULL;
       return true;
     }
 
     capturer_ = capturer;
+    capturer_->AddSink(this, sink_capabilities_);

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

I think it would be better to add capabilities() to the VideoSinkInterface and
then have this implementation implement it (instead of storing it) and then call
capturer_->AddSink(this) without the capabilities passed in.

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

PTAL. I think I have now changed this to be as we discussed.

   }
-  // Lock cannot be held while connecting the capturer to prevent lock-order
-  // violations.
-  capturer->SignalVideoFrame.connect(this, &WebRtcVideoSendStream::InputFrame);
   return true;
 }
 
 // TODO(pbos): Apply this on the VideoAdapter instead!
 bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetVideoFormat(
     const VideoFormat& format) {
   if ((format.width == 0 || format.height == 0) &&
       format.width != format.height) {
     LOG(LS_ERROR) << "Can't set VideoFormat, width or height is zero (but not "
                      "both, 0x0 drops frames).";
@@ skipping 27 matching lines @@
     rtc::CritScope cs(&lock_);
     if (capturer_ == NULL)
       return false;
 
     if (capturer_->video_adapter() != nullptr)
       old_adapt_changes_ += capturer_->video_adapter()->adaptation_changes();
 
     capturer = capturer_;
     capturer_ = NULL;
   }
-  capturer->SignalVideoFrame.disconnect(this);
+  capturer->RemoveSink(this);
   return true;
 }
 
 const std::vector<uint32_t>&
 WebRtcVideoChannel2::WebRtcVideoSendStream::GetSsrcs() const {
   return ssrcs_;
 }
 
 void WebRtcVideoChannel2::WebRtcVideoSendStream::SetOptions(
     const VideoOptions& options) {
@@ skipping 121 matching lines @@
   rtc::CritScope cs(&lock_);
   // |recreate_stream| means construction-time parameters have changed and the
   // sending stream needs to be reset with the new config.
   bool recreate_stream = false;
   if (params.rtcp_mode) {
     parameters_.config.rtp.rtcp_mode = *params.rtcp_mode;
     recreate_stream = true;
   }
   if (params.rtp_header_extensions) {
     parameters_.config.rtp.extensions = *params.rtp_header_extensions;
+    sink_capabilities_.can_apply_rotation = ContainsHeaderExtension(
+        *params.rtp_header_extensions, kRtpVideoRotationHeaderExtension);
     if (capturer_) {
-      capturer_->SetApplyRotation(!ContainsHeaderExtension(
-          *params.rtp_header_extensions, kRtpVideoRotationHeaderExtension));
+      capturer_->RemoveSink(this);
+      capturer_->AddSink(this, sink_capabilities_);

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

Why not just fire SignalCapabilitiesChanged()?

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

PTAL

     }
     recreate_stream = true;
   }
   if (params.max_bandwidth_bps) {
     // Max bitrate has changed, reconfigure encoder settings on the next frame
     // or stream recreation.
     parameters_.max_bitrate_bps = *params.max_bandwidth_bps;
     pending_encoder_reconfiguration_ = true;
   }
   // Set codecs and options.
@@ skipping 691 matching lines @@
       video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
     }
   }
 
   return video_codecs;
 }
 
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VIDEO