| 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> | |
| 8 | 7 |
| 9 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
| 10 #include "base/android/scoped_java_ref.h" | |
| 11 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 12 #include "jni/VideoCapture_jni.h" | 10 #include "jni/VideoCapture_jni.h" |
| 13 #include "media/video/capture/android/video_capture_device_factory_android.h" | 11 #include "media/video/capture/android/video_capture_device_factory_android.h" |
| 14 | 12 |
| 15 using base::android::AttachCurrentThread; | 13 using base::android::AttachCurrentThread; |
| 16 using base::android::CheckException; | 14 using base::android::CheckException; |
| 17 using base::android::GetClass; | 15 using base::android::GetClass; |
| 18 using base::android::MethodID; | 16 using base::android::MethodID; |
| 19 using base::android::JavaRef; | 17 using base::android::JavaRef; |
| 20 using base::android::ScopedJavaLocalRef; | 18 using base::android::ScopedJavaLocalRef; |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 | 198 |
| 201 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) { | 199 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) { |
| 202 { | 200 { |
| 203 base::AutoLock lock(lock_); | 201 base::AutoLock lock(lock_); |
| 204 state_ = kError; | 202 state_ = kError; |
| 205 } | 203 } |
| 206 client_->OnError(reason); | 204 client_->OnError(reason); |
| 207 } | 205 } |
| 208 | 206 |
| 209 } // namespace media | 207 } // namespace media |
| OLD | NEW |