Refactor WebRtcVideoCapturer.

webrtc/media/engine/webrtcvideocapturer.cc

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/media/engine/webrtcvideocapturer.h"
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/media/engine/webrtcvideoframe.h"
 #include "webrtc/media/engine/webrtcvideoframefactory.h"

[nisse-webrtc, 2016/08/19 12:48:42]

Note to self: Drop this include.

[perkj_webrtc, 2016/08/19 13:08:59]

sg

 
 #include "webrtc/base/win32.h"  // Need this to #include the impl files.
 #include "webrtc/modules/video_capture/video_capture_factory.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace cricket {
 
 struct kVideoFourCCEntry {
   uint32_t fourcc;
   webrtc::RawVideoType webrtc_type;
@@ skipping 307 matching lines @@
   for (size_t i = 0; i < arraysize(kSupportedFourCCs); ++i) {
     fourccs->push_back(kSupportedFourCCs[i].fourcc);
   }
   return true;
 }
 
 void WebRtcVideoCapturer::OnIncomingCapturedFrame(
     const int32_t id,
     const webrtc::VideoFrame& sample) {
   // This can only happen between Start() and Stop().
   RTC_DCHECK(start_thread_);

[nisse-webrtc, 2016/08/19 12:01:16]

I guess we can delete the async_invoker_. Can we delete start_thread_ too, or
what is that needed for?

[perkj_webrtc, 2016/08/19 13:08:59]

drop it all.

   RTC_DCHECK(async_invoker_);
-  if (start_thread_->IsCurrent()) {
-    SignalFrameCapturedOnStartThread(sample);
-  } else {
-    // This currently happens on with at least VideoCaptureModuleV4L2 and
-    // possibly other implementations of WebRTC's VideoCaptureModule.
-    // In order to maintain the threading contract with the upper layers and
-    // consistency with other capturers such as in Chrome, we need to do a
-    // thread hop.
-    // Note that Stop() can cause the async invoke call to be cancelled.
-    async_invoker_->AsyncInvoke<void>(
-        RTC_FROM_HERE, start_thread_,
-        // Note that Bind captures by value, so there's an intermediate copy
-        // of sample.
-        rtc::Bind(&WebRtcVideoCapturer::SignalFrameCapturedOnStartThread, this,
-                  sample));
+
+  ++captured_frames_;
+  // Log the size and pixel aspect ratio of the first captured frame.
+  if (1 == captured_frames_) {
+    LOG(LS_INFO) << "Captured frame size "
+                 << sample.width() << "x" << sample.height()
+                 << ". Expected format " << GetCaptureFormat()->ToString();
   }
+
+  OnFrame(cricket::WebRtcVideoFrame(
+              sample.video_frame_buffer(), sample.rotation(),
+              sample.render_time_ms() * rtc::kNumMicrosecsPerMillisec, 0),
+          sample.width(), sample.height());
 }
 
 void WebRtcVideoCapturer::OnCaptureDelayChanged(const int32_t id,
                                                 const int32_t delay) {
   LOG(LS_INFO) << "Capture delay changed to " << delay << " ms";
 }
 
-void WebRtcVideoCapturer::SignalFrameCapturedOnStartThread(
-    const webrtc::VideoFrame& frame) {
-  // This can only happen between Start() and Stop().
-  RTC_DCHECK(start_thread_);
-  RTC_DCHECK(start_thread_->IsCurrent());
-  RTC_DCHECK(async_invoker_);
-
-  ++captured_frames_;
-  // Log the size and pixel aspect ratio of the first captured frame.
-  if (1 == captured_frames_) {
-    LOG(LS_INFO) << "Captured frame size "
-                 << frame.width() << "x" << frame.height()
-                 << ". Expected format " << GetCaptureFormat()->ToString();
-  }
-
-  // Signal down stream components on captured frame.
-  // The CapturedFrame class doesn't support planes. We have to ExtractBuffer
-  // to one block for it.
-  size_t length =
-      webrtc::CalcBufferSize(webrtc::kI420, frame.width(), frame.height());
-  capture_buffer_.resize(length);
-  // TODO(magjed): Refactor the WebRtcCapturedFrame to avoid memory copy or
-  // take over ownership of the buffer held by |frame| if that's possible.
-  webrtc::ExtractBuffer(frame, length, &capture_buffer_[0]);
-  WebRtcCapturedFrame webrtc_frame(frame, &capture_buffer_[0], length);
-  SignalFrameCaptured(this, &webrtc_frame);
-}
-
-// WebRtcCapturedFrame
-WebRtcCapturedFrame::WebRtcCapturedFrame(const webrtc::VideoFrame& sample,
-                                         void* buffer,
-                                         size_t length) {
-  width = sample.width();
-  height = sample.height();
-  fourcc = FOURCC_I420;
-  // TODO(hellner): Support pixel aspect ratio (for OSX).
-  pixel_width = 1;
-  pixel_height = 1;
-  // Convert units from VideoFrame RenderTimeMs to CapturedFrame (nanoseconds).
-  time_stamp = sample.render_time_ms() * rtc::kNumNanosecsPerMillisec;
-  data_size = rtc::checked_cast<uint32_t>(length);
-  data = buffer;
-  rotation = sample.rotation();
-}
-
 }  // namespace cricket