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/frame_generator_capturer.cc b/test/frame_generator_capturer.cc
index 66d9a9b..fcab602 100644
--- a/test/frame_generator_capturer.cc
+++ b/test/frame_generator_capturer.cc
@@ -21,12 +21,11 @@
namespace webrtc {
namespace test {
-FrameGeneratorCapturer* FrameGeneratorCapturer::Create(
- VideoSendStreamInput* input,
- size_t width,
- size_t height,
- int target_fps,
- Clock* clock) {
+FrameGeneratorCapturer* FrameGeneratorCapturer::Create(VideoCaptureInput* input,
+ size_t width,
+ size_t height,
+ int target_fps,
+ Clock* clock) {
FrameGeneratorCapturer* capturer = new FrameGeneratorCapturer(
clock, input, FrameGenerator::CreateChromaGenerator(width, height),
target_fps);
@@ -39,7 +38,7 @@
}
FrameGeneratorCapturer* FrameGeneratorCapturer::CreateFromYuvFile(
- VideoSendStreamInput* input,
+ VideoCaptureInput* input,
const std::string& file_name,
size_t width,
size_t height,
@@ -59,7 +58,7 @@
}
FrameGeneratorCapturer::FrameGeneratorCapturer(Clock* clock,
- VideoSendStreamInput* input,
+ VideoCaptureInput* input,
FrameGenerator* frame_generator,
int target_fps)
: VideoCapturer(input),
diff --git a/test/frame_generator_capturer.h b/test/frame_generator_capturer.h
index a1ca336..86df689 100644
--- a/test/frame_generator_capturer.h
+++ b/test/frame_generator_capturer.h
@@ -29,13 +29,13 @@
class FrameGeneratorCapturer : public VideoCapturer {
public:
- static FrameGeneratorCapturer* Create(VideoSendStreamInput* input,
+ static FrameGeneratorCapturer* Create(VideoCaptureInput* input,
size_t width,
size_t height,
int target_fps,
Clock* clock);
- static FrameGeneratorCapturer* CreateFromYuvFile(VideoSendStreamInput* input,
+ static FrameGeneratorCapturer* CreateFromYuvFile(VideoCaptureInput* input,
const std::string& file_name,
size_t width,
size_t height,
@@ -49,7 +49,7 @@
int64_t first_frame_capture_time() const { return first_frame_capture_time_; }
FrameGeneratorCapturer(Clock* clock,
- VideoSendStreamInput* input,
+ VideoCaptureInput* input,
FrameGenerator* frame_generator,
int target_fps);
bool Init();
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)) {
diff --git a/test/vcm_capturer.h b/test/vcm_capturer.h
index 3b5d9e3..93321f0 100644
--- a/test/vcm_capturer.h
+++ b/test/vcm_capturer.h
@@ -20,8 +20,10 @@
class VcmCapturer : public VideoCapturer, public VideoCaptureDataCallback {
public:
- static VcmCapturer* Create(VideoSendStreamInput* input, size_t width,
- size_t height, size_t target_fps);
+ static VcmCapturer* Create(VideoCaptureInput* input,
+ size_t width,
+ size_t height,
+ size_t target_fps);
virtual ~VcmCapturer();
void Start() override;
@@ -32,7 +34,7 @@
void OnCaptureDelayChanged(const int32_t id, const int32_t delay) override;
private:
- explicit VcmCapturer(VideoSendStreamInput* input);
+ explicit VcmCapturer(VideoCaptureInput* input);
bool Init(size_t width, size_t height, size_t target_fps);
void Destroy();
diff --git a/test/video_capturer.cc b/test/video_capturer.cc
index fc37648..840378f 100644
--- a/test/video_capturer.cc
+++ b/test/video_capturer.cc
@@ -26,10 +26,10 @@
virtual void Stop() {}
};
-VideoCapturer::VideoCapturer(VideoSendStreamInput* input)
- : input_(input) {}
+VideoCapturer::VideoCapturer(VideoCaptureInput* input) : input_(input) {
+}
-VideoCapturer* VideoCapturer::Create(VideoSendStreamInput* input,
+VideoCapturer* VideoCapturer::Create(VideoCaptureInput* input,
size_t width,
size_t height,
int fps,
diff --git a/test/video_capturer.h b/test/video_capturer.h
index ec576a0..3fe86f1 100644
--- a/test/video_capturer.h
+++ b/test/video_capturer.h
@@ -16,13 +16,13 @@
class Clock;
-class VideoSendStreamInput;
+class VideoCaptureInput;
namespace test {
class VideoCapturer {
public:
- static VideoCapturer* Create(VideoSendStreamInput* input,
+ static VideoCapturer* Create(VideoCaptureInput* input,
size_t width,
size_t height,
int fps,
@@ -33,8 +33,8 @@
virtual void Stop() = 0;
protected:
- explicit VideoCapturer(VideoSendStreamInput* input);
- VideoSendStreamInput* input_;
+ explicit VideoCapturer(VideoCaptureInput* input);
+ VideoCaptureInput* input_;
};
} // test
} // webrtc
