OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/android/video_capture_device_android.h" | 5 #include "media/video/capture/android/video_capture_device_android.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 bool VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice(JNIEnv* env) { | 25 bool VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice(JNIEnv* env) { |
26 return RegisterNativesImpl(env); | 26 return RegisterNativesImpl(env); |
27 } | 27 } |
28 | 28 |
29 // TODO(mcasas): Remove the following static methods when they are no longer | 29 // TODO(mcasas): Remove the following static methods when they are no longer |
30 // referenced from VideoCaptureDeviceFactory, i.e. when all OS platforms have | 30 // referenced from VideoCaptureDeviceFactory, i.e. when all OS platforms have |
31 // splitted the VideoCaptureDevice into VideoCaptureDevice and | 31 // splitted the VideoCaptureDevice into VideoCaptureDevice and |
32 // VideoCaptureDeviceFactory. | 32 // VideoCaptureDeviceFactory. |
33 | 33 |
34 // static | 34 // static |
35 VideoCaptureDevice* VideoCaptureDevice::Create(const Name& device_name) { | 35 VideoCaptureDevice* VideoCaptureDevice::Create( |
| 36 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| 37 const Name& device_name) { |
36 NOTREACHED(); | 38 NOTREACHED(); |
37 return NULL; | 39 return NULL; |
38 } | 40 } |
39 // static | 41 // static |
40 void VideoCaptureDevice::GetDeviceNames(Names* device_names) { | 42 void VideoCaptureDevice::GetDeviceNames(Names* device_names) { |
41 NOTREACHED(); | 43 NOTREACHED(); |
42 } | 44 } |
43 | 45 |
44 // static | 46 // static |
45 void VideoCaptureDevice::GetDeviceSupportedFormats( | 47 void VideoCaptureDevice::GetDeviceSupportedFormats( |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) { | 216 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) { |
215 LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason; | 217 LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason; |
216 { | 218 { |
217 base::AutoLock lock(lock_); | 219 base::AutoLock lock(lock_); |
218 state_ = kError; | 220 state_ = kError; |
219 } | 221 } |
220 client_->OnError(reason); | 222 client_->OnError(reason); |
221 } | 223 } |
222 | 224 |
223 } // namespace media | 225 } // namespace media |
OLD | NEW |