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

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

Issue 2837273004: media: add video capture device for ARC++ camera HAL v3 (Closed)
Patch Set: address chfremer@'s review comments Created 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/capture/video/linux/video_capture_device_factory_linux.h" 5 #include "media/capture/video/linux/video_capture_device_factory_linux.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <sys/ioctl.h> 10 #include <sys/ioctl.h>
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 std::string usb_id; 257 std::string usb_id;
258 if (!ReadIdFile(vidPath, &usb_id)) 258 if (!ReadIdFile(vidPath, &usb_id))
259 return ""; 259 return "";
260 usb_id.append(":"); 260 usb_id.append(":");
261 if (!ReadIdFile(pidPath, &usb_id)) 261 if (!ReadIdFile(pidPath, &usb_id))
262 return ""; 262 return "";
263 263
264 return usb_id; 264 return usb_id;
265 } 265 }
266 266
267 #if !defined(OS_CHROMEOS)
wuchengli 2017/04/28 06:29:28 Try controlling this in media/capture/BUILD.gn. If
jcliang 2017/04/28 08:27:49 There are rules in BUILDCONFIG.gn to control what
267 // static 268 // static
268 VideoCaptureDeviceFactory* 269 VideoCaptureDeviceFactory*
269 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory( 270 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
270 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { 271 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
271 return new VideoCaptureDeviceFactoryLinux(ui_task_runner); 272 return new VideoCaptureDeviceFactoryLinux(ui_task_runner);
272 } 273 }
274 #endif
273 275
274 } // namespace media 276 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698