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

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

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 years, 1 month 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/modules/video_capture/windows/video_capture_ds.h" 11 #include "webrtc/modules/video_capture/windows/video_capture_ds.h"
12 12
13 #include "webrtc/modules/video_capture/video_capture_config.h" 13 #include "webrtc/modules/video_capture/video_capture_config.h"
14 #include "webrtc/modules/video_capture/windows/help_functions_ds.h" 14 #include "webrtc/modules/video_capture/windows/help_functions_ds.h"
15 #include "webrtc/modules/video_capture/windows/sink_filter_ds.h" 15 #include "webrtc/modules/video_capture/windows/sink_filter_ds.h"
16 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 16 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
17 #include "webrtc/system_wrappers/interface/trace.h" 17 #include "webrtc/system_wrappers/include/trace.h"
18 18
19 #include <Dvdmedia.h> // VIDEOINFOHEADER2 19 #include <Dvdmedia.h> // VIDEOINFOHEADER2
20 20
21 namespace webrtc 21 namespace webrtc
22 { 22 {
23 namespace videocapturemodule 23 namespace videocapturemodule
24 { 24 {
25 VideoCaptureDS::VideoCaptureDS(const int32_t id) 25 VideoCaptureDS::VideoCaptureDS(const int32_t id)
26 : VideoCaptureImpl(id), _dsInfo(id), _captureFilter(NULL), 26 : VideoCaptureImpl(id), _dsInfo(id), _captureFilter(NULL),
27 _graphBuilder(NULL), _mediaControl(NULL), _sinkFilter(NULL), 27 _graphBuilder(NULL), _mediaControl(NULL), _sinkFilter(NULL),
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id, 405 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id,
406 "Failed to connect capture device to the send graph: 0x %x", 406 "Failed to connect capture device to the send graph: 0x %x",
407 hr); 407 hr);
408 } 408 }
409 return hr; 409 return hr;
410 } 410 }
411 return hr; 411 return hr;
412 } 412 }
413 } // namespace videocapturemodule 413 } // namespace videocapturemodule
414 } // namespace webrtc 414 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698