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

Unified Diff: webrtc/modules/video_capture/windows/video_capture_factory_windows.cc

Issue 2534553002: Replace VideoCaptureDataCallback by VideoSinkInterface. (Closed)
Patch Set: Break overlong lines. Created 4 years 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/modules/video_capture/windows/video_capture_factory_windows.cc
diff --git a/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc b/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc
index 0d347cb64f428e43d0952ca9e06a9b2753bac28a..e7eee39e5282099d5f682781587c601c7814c7bb 100644
--- a/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc
+++ b/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc
@@ -17,22 +17,20 @@ namespace webrtc {
namespace videocapturemodule {
// static
-VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo(
- const int32_t id) {
+VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo() {
// TODO(tommi): Use the Media Foundation version on Vista and up.
- return DeviceInfoDS::Create(id);
+ return DeviceInfoDS::Create();
}
rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create(
- const int32_t id,
const char* device_id) {
if (device_id == nullptr)
return nullptr;
// TODO(tommi): Use Media Foundation implementation for Vista and up.
rtc::scoped_refptr<VideoCaptureDS> capture(
- new rtc::RefCountedObject<VideoCaptureDS>(id));
- if (capture->Init(id, device_id) != 0) {
+ new rtc::RefCountedObject<VideoCaptureDS>());
+ if (capture->Init(device_id) != 0) {
return nullptr;
}
« no previous file with comments | « webrtc/modules/video_capture/windows/video_capture_ds.cc ('k') | webrtc/modules/video_capture/windows/video_capture_mf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698