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

Side by Side Diff: media/video/capture/linux/video_capture_device_linux.cc

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « media/video/capture/file_video_capture_device.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/video/capture/linux/video_capture_device_linux.h" 5 #include "media/video/capture/linux/video_capture_device_linux.h"
6 6
7 #if defined(OS_OPENBSD) 7 #if defined(OS_OPENBSD)
8 #include <sys/videoio.h> 8 #include <sys/videoio.h>
9 #else 9 #else
10 #include <linux/videodev2.h> 10 #include <linux/videodev2.h>
11 #endif 11 #endif
12 12
13 #include <list> 13 #include <list>
14 #include <string>
15 14
16 #include "base/bind.h" 15 #include "base/bind.h"
17 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
18 #include "media/video/capture/linux/v4l2_capture_delegate.h" 17 #include "media/video/capture/linux/v4l2_capture_delegate.h"
19 18
20 namespace media { 19 namespace media {
21 20
22 // USB VID and PID are both 4 bytes long. 21 // USB VID and PID are both 4 bytes long.
23 static const size_t kVidPidSize = 4; 22 static const size_t kVidPidSize = 4;
24 23
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 return V4L2_CID_POWER_LINE_FREQUENCY_50HZ; 139 return V4L2_CID_POWER_LINE_FREQUENCY_50HZ;
141 case kPowerLine60Hz: 140 case kPowerLine60Hz:
142 return V4L2_CID_POWER_LINE_FREQUENCY_60HZ; 141 return V4L2_CID_POWER_LINE_FREQUENCY_60HZ;
143 default: 142 default:
144 // If we have no idea of the frequency, at least try and set it to AUTO. 143 // If we have no idea of the frequency, at least try and set it to AUTO.
145 return V4L2_CID_POWER_LINE_FREQUENCY_AUTO; 144 return V4L2_CID_POWER_LINE_FREQUENCY_AUTO;
146 } 145 }
147 } 146 }
148 147
149 } // namespace media 148 } // namespace media
OLDNEW
« no previous file with comments | « media/video/capture/file_video_capture_device.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698