Move frame input (ViECapturer) to webrtc/video/.
Renames ViECapturer to VideoCaptureInput and initializes several
parameters on construction instead of setters.
Also removes an old deadlock suppression.
BUG=1695, 2999
R=asapersson@webrtc.org, mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/53559004.
Cr-Original-Commit-Position: refs/heads/master@{#9508}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 4b91bd08979fcfb191cdae27ad24936beefce735
diff --git a/test/vcm_capturer.cc b/test/vcm_capturer.cc
index dbb28ab..c37140f 100644
--- a/test/vcm_capturer.cc
+++ b/test/vcm_capturer.cc
@@ -16,8 +16,9 @@
namespace webrtc {
namespace test {
-VcmCapturer::VcmCapturer(webrtc::VideoSendStreamInput* input)
- : VideoCapturer(input), started_(false), vcm_(NULL) {}
+VcmCapturer::VcmCapturer(webrtc::VideoCaptureInput* input)
+ : VideoCapturer(input), started_(false), vcm_(NULL) {
+}
bool VcmCapturer::Init(size_t width, size_t height, size_t target_fps) {
VideoCaptureModule::DeviceInfo* device_info =
@@ -53,8 +54,9 @@
return true;
}
-VcmCapturer* VcmCapturer::Create(VideoSendStreamInput* input,
- size_t width, size_t height,
+VcmCapturer* VcmCapturer::Create(VideoCaptureInput* input,
+ size_t width,
+ size_t height,
size_t target_fps) {
VcmCapturer* vcm__capturer = new VcmCapturer(input);
if (!vcm__capturer->Init(width, height, target_fps)) {
