| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/chromeos/video_capture_device_factory_chromeos.h" | 5 #include "media/capture/video/chromeos/video_capture_device_factory_chromeos.h" |
| 6 | 6 |
| 7 #include "base/files/file_util.h" | 7 #include "base/files/file_util.h" |
| 8 #include "media/capture/video/linux/video_capture_device_factory_linux.h" | 8 #include "media/capture/video/linux/video_capture_device_factory_linux.h" |
| 9 | 9 |
| 10 namespace media { | 10 namespace media { |
| 11 | 11 |
| 12 VideoCaptureDeviceFactoryChromeOS::VideoCaptureDeviceFactoryChromeOS( | 12 VideoCaptureDeviceFactoryChromeOS::VideoCaptureDeviceFactoryChromeOS( |
| 13 scoped_refptr<base::SingleThreadTaskRunner> task_runner_for_screen_observer) | 13 scoped_refptr<base::SingleThreadTaskRunner> task_runner_for_screen_observer) |
| 14 : task_runner_for_screen_observer_(task_runner_for_screen_observer), | 14 : task_runner_for_screen_observer_(task_runner_for_screen_observer), |
| 15 camera_hal_ipc_thread_("CameraHalIpcThread") {} | 15 camera_hal_ipc_thread_("CameraHalIpcThread") {} |
| 16 | 16 |
| 17 VideoCaptureDeviceFactoryChromeOS::~VideoCaptureDeviceFactoryChromeOS() { | 17 VideoCaptureDeviceFactoryChromeOS::~VideoCaptureDeviceFactoryChromeOS() { |
| 18 camera_hal_delegate_->Reset(); | 18 camera_hal_delegate_->Reset(); |
| 19 camera_hal_ipc_thread_.Stop(); | 19 camera_hal_ipc_thread_.Stop(); |
| 20 } | 20 } |
| 21 | 21 |
| 22 bool VideoCaptureDeviceFactoryChromeOS::Init() { | 22 bool VideoCaptureDeviceFactoryChromeOS::Init() { |
| 23 if (!camera_hal_ipc_thread_.Start()) { | 23 if (!camera_hal_ipc_thread_.Start()) { |
| 24 LOG(ERROR) << "Module thread failed to start"; | 24 LOG(ERROR) << "Module thread failed to start"; |
| 25 return false; | 25 return false; |
| 26 } | 26 } |
| 27 |
| 28 if (!ArcCamera3Service::GetInstance()->is_started() && |
| 29 !ArcCamera3Service::GetInstance()->Start()) { |
| 30 LOG(ERROR) << "Failed to start ArcCamera3Service"; |
| 31 return false; |
| 32 } |
| 33 |
| 27 camera_hal_delegate_ = | 34 camera_hal_delegate_ = |
| 28 new CameraHalDelegate(camera_hal_ipc_thread_.task_runner()); | 35 new CameraHalDelegate(camera_hal_ipc_thread_.task_runner()); |
| 29 return camera_hal_delegate_->StartCameraModuleIpc(); | 36 camera_hal_delegate_->RegisterCameraClient(); |
| 37 return true; |
| 30 } | 38 } |
| 31 | 39 |
| 32 std::unique_ptr<VideoCaptureDevice> | 40 std::unique_ptr<VideoCaptureDevice> |
| 33 VideoCaptureDeviceFactoryChromeOS::CreateDevice( | 41 VideoCaptureDeviceFactoryChromeOS::CreateDevice( |
| 34 const VideoCaptureDeviceDescriptor& device_descriptor) { | 42 const VideoCaptureDeviceDescriptor& device_descriptor) { |
| 35 DCHECK(thread_checker_.CalledOnValidThread()); | 43 DCHECK(thread_checker_.CalledOnValidThread()); |
| 36 DCHECK(camera_hal_delegate_); | 44 DCHECK(camera_hal_delegate_); |
| 37 return camera_hal_delegate_->CreateDevice(task_runner_for_screen_observer_, | 45 return camera_hal_delegate_->CreateDevice(task_runner_for_screen_observer_, |
| 38 device_descriptor); | 46 device_descriptor); |
| 39 } | 47 } |
| (...skipping 29 matching lines...) Expand all Loading... |
| 69 return nullptr; | 77 return nullptr; |
| 70 } | 78 } |
| 71 return factory.release(); | 79 return factory.release(); |
| 72 } else { | 80 } else { |
| 73 return new VideoCaptureDeviceFactoryLinux(task_runner_for_screen_observer); | 81 return new VideoCaptureDeviceFactoryLinux(task_runner_for_screen_observer); |
| 74 } | 82 } |
| 75 } | 83 } |
| 76 #endif | 84 #endif |
| 77 | 85 |
| 78 } // namespace media | 86 } // namespace media |
| OLD | NEW |