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

Unified Diff: webrtc/media/webrtc/webrtcvideocapturerfactory.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Disable sign-compare warning on Win Clang Created 4 years, 11 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
Index: webrtc/media/webrtc/webrtcvideocapturerfactory.cc
diff --git a/webrtc/p2p/base/sessionid.h b/webrtc/media/webrtc/webrtcvideocapturerfactory.cc
similarity index 53%
copy from webrtc/p2p/base/sessionid.h
copy to webrtc/media/webrtc/webrtcvideocapturerfactory.cc
index f69570039b4da7156a19e69960509dfec40cd844..63364935114d047aaa7bf11e012500595daa08a7 100644
--- a/webrtc/p2p/base/sessionid.h
+++ b/webrtc/media/webrtc/webrtcvideocapturerfactory.cc
@@ -8,13 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_P2P_BASE_SESSIONID_H_
-#define WEBRTC_P2P_BASE_SESSIONID_H_
-
-// TODO: Remove this file.
+#include "webrtc/base/scoped_ptr.h"
+#include "webrtc/media/webrtc/webrtcvideocapturer.h"
+#include "webrtc/media/webrtc/webrtcvideocapturerfactory.h"
namespace cricket {
-} // namespace cricket
+VideoCapturer* WebRtcVideoDeviceCapturerFactory::Create(const Device& device) {
+ rtc::scoped_ptr<WebRtcVideoCapturer> capturer(
+ new WebRtcVideoCapturer());
+ if (!capturer->Init(device)) {
+ return NULL;
+ }
+ return capturer.release();
+}
-#endif // WEBRTC_P2P_BASE_SESSIONID_H_
+} // namespace cricket

Powered by Google App Engine
This is Rietveld 408576698