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

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

Issue 2936373002: Revert of media: add video capture device for ARC++ camera HAL v3 (Closed)
Patch Set: Created 3 years, 6 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 // Reduce number of log messages by logging each NOTIMPLEMENTED() only once. 5 // Reduce number of log messages by logging each NOTIMPLEMENTED() only once.
6 // // This has to be before any other includes, else default is picked up. 6 // // This has to be before any other includes, else default is picked up.
7 // // See base/logging.h for details on this. 7 // // See base/logging.h for details on this.
8 // #define NOTIMPLEMENTED_POLICY 5 8 // #define NOTIMPLEMENTED_POLICY 5
9 9
10 #include "media/capture/video/linux/video_capture_device_factory_linux.h" 10 #include "media/capture/video/linux/video_capture_device_factory_linux.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 265
266 usb_id.append(":"); 266 usb_id.append(":");
267 const std::string pid_path = 267 const std::string pid_path =
268 base::StringPrintf(kPidPathTemplate, file_name.c_str()); 268 base::StringPrintf(kPidPathTemplate, file_name.c_str());
269 if (!ReadIdFile(pid_path, &usb_id)) 269 if (!ReadIdFile(pid_path, &usb_id))
270 usb_id.clear(); 270 usb_id.clear();
271 271
272 return usb_id; 272 return usb_id;
273 } 273 }
274 274
275 #if !defined(OS_CHROMEOS)
276 // static 275 // static
277 VideoCaptureDeviceFactory* 276 VideoCaptureDeviceFactory*
278 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory( 277 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
279 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { 278 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
280 return new VideoCaptureDeviceFactoryLinux(ui_task_runner); 279 return new VideoCaptureDeviceFactoryLinux(ui_task_runner);
281 } 280 }
282 #endif
283 281
284 } // namespace media 282 } // namespace media
OLDNEW
« no previous file with comments | « media/capture/video/linux/video_capture_device_chromeos.cc ('k') | media/capture/video/video_capture_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698