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

Side by Side Diff: webrtc/modules/video_capture/linux/video_capture_linux.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 <errno.h> 11 #include <errno.h>
12 #include <fcntl.h> 12 #include <fcntl.h>
13 #include <linux/videodev2.h> 13 #include <linux/videodev2.h>
14 #include <stdio.h> 14 #include <stdio.h>
15 #include <string.h> 15 #include <string.h>
16 #include <sys/ioctl.h> 16 #include <sys/ioctl.h>
17 #include <sys/mman.h> 17 #include <sys/mman.h>
18 #include <sys/stat.h> 18 #include <sys/stat.h>
19 #include <unistd.h> 19 #include <unistd.h>
20 20
21 #include <iostream> 21 #include <iostream>
22 #include <new> 22 #include <new>
23 23
24 #include "webrtc/modules/video_capture/linux/video_capture_linux.h" 24 #include "webrtc/modules/video_capture/linux/video_capture_linux.h"
25 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 25 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
26 #include "webrtc/system_wrappers/interface/ref_count.h" 26 #include "webrtc/system_wrappers/include/ref_count.h"
27 #include "webrtc/system_wrappers/interface/trace.h" 27 #include "webrtc/system_wrappers/include/trace.h"
28 28
29 namespace webrtc 29 namespace webrtc
30 { 30 {
31 namespace videocapturemodule 31 namespace videocapturemodule
32 { 32 {
33 VideoCaptureModule* VideoCaptureImpl::Create(const int32_t id, 33 VideoCaptureModule* VideoCaptureImpl::Create(const int32_t id,
34 const char* deviceUniqueId) 34 const char* deviceUniqueId)
35 { 35 {
36 RefCountImpl<videocapturemodule::VideoCaptureModuleV4L2>* implementation = 36 RefCountImpl<videocapturemodule::VideoCaptureModuleV4L2>* implementation =
37 new RefCountImpl<videocapturemodule::VideoCaptureModuleV4L2>(id); 37 new RefCountImpl<videocapturemodule::VideoCaptureModuleV4L2>(id);
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 { 483 {
484 settings.width = _currentWidth; 484 settings.width = _currentWidth;
485 settings.height = _currentHeight; 485 settings.height = _currentHeight;
486 settings.maxFPS = _currentFrameRate; 486 settings.maxFPS = _currentFrameRate;
487 settings.rawType=_captureVideoType; 487 settings.rawType=_captureVideoType;
488 488
489 return 0; 489 return 0;
490 } 490 }
491 } // namespace videocapturemodule 491 } // namespace videocapturemodule
492 } // namespace webrtc 492 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698