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

Side by Side Diff: webrtc/modules/video_capture/windows/video_capture_factory_windows.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/base/refcount.h"
12 #include "webrtc/base/scoped_ref_ptr.h"
11 #include "webrtc/modules/video_capture/windows/video_capture_ds.h" 13 #include "webrtc/modules/video_capture/windows/video_capture_ds.h"
12 #include "webrtc/modules/video_capture/windows/video_capture_mf.h" 14 #include "webrtc/modules/video_capture/windows/video_capture_mf.h"
13 #include "webrtc/rtc_base/refcount.h"
14 #include "webrtc/rtc_base/scoped_ref_ptr.h"
15 15
16 namespace webrtc { 16 namespace webrtc {
17 namespace videocapturemodule { 17 namespace videocapturemodule {
18 18
19 // static 19 // static
20 VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo() { 20 VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo() {
21 // TODO(tommi): Use the Media Foundation version on Vista and up. 21 // TODO(tommi): Use the Media Foundation version on Vista and up.
22 return DeviceInfoDS::Create(); 22 return DeviceInfoDS::Create();
23 } 23 }
24 24
25 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create( 25 rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create(
26 const char* device_id) { 26 const char* device_id) {
27 if (device_id == nullptr) 27 if (device_id == nullptr)
28 return nullptr; 28 return nullptr;
29 29
30 // TODO(tommi): Use Media Foundation implementation for Vista and up. 30 // TODO(tommi): Use Media Foundation implementation for Vista and up.
31 rtc::scoped_refptr<VideoCaptureDS> capture( 31 rtc::scoped_refptr<VideoCaptureDS> capture(
32 new rtc::RefCountedObject<VideoCaptureDS>()); 32 new rtc::RefCountedObject<VideoCaptureDS>());
33 if (capture->Init(device_id) != 0) { 33 if (capture->Init(device_id) != 0) {
34 return nullptr; 34 return nullptr;
35 } 35 }
36 36
37 return capture; 37 return capture;
38 } 38 }
39 39
40 } // namespace videocapturemodule 40 } // namespace videocapturemodule
41 } // namespace webrtc 41 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/windows/sink_filter_ds.cc ('k') | webrtc/modules/video_coding/codec_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698