Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(583)

Unified Diff: webrtc/test/video_capturer.cc

Issue 2344923002: Revert of Replace interface VideoCapturerInput with VideoSinkInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/test/video_capturer.h ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/video_capturer.cc
diff --git a/webrtc/test/video_capturer.cc b/webrtc/test/video_capturer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..840378f0136d1d34c31460c0096b5cf9c61ce53f
--- /dev/null
+++ b/webrtc/test/video_capturer.cc
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2013 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/test/video_capturer.h"
+
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/test/frame_generator_capturer.h"
+#include "webrtc/test/vcm_capturer.h"
+
+namespace webrtc {
+namespace test {
+
+class NullCapturer : public VideoCapturer {
+ public:
+ NullCapturer() : VideoCapturer(NULL) {}
+ virtual ~NullCapturer() {}
+
+ virtual void Start() {}
+ virtual void Stop() {}
+};
+
+VideoCapturer::VideoCapturer(VideoCaptureInput* input) : input_(input) {
+}
+
+VideoCapturer* VideoCapturer::Create(VideoCaptureInput* input,
+ size_t width,
+ size_t height,
+ int fps,
+ Clock* clock) {
+ VcmCapturer* vcm_capturer = VcmCapturer::Create(input, width, height, fps);
+
+ if (vcm_capturer != NULL) {
+ return vcm_capturer;
+ }
+ // TODO(pbos): Log a warning that this failed.
+
+ FrameGeneratorCapturer* frame_generator_capturer =
+ FrameGeneratorCapturer::Create(input, width, height, fps, clock);
+ if (frame_generator_capturer != NULL) {
+ return frame_generator_capturer;
+ }
+ // TODO(pbos): Log a warning that this failed.
+
+ return new NullCapturer();
+}
+} // test
+} // webrtc
« no previous file with comments | « webrtc/test/video_capturer.h ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698