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/jni_string.h" | 10 #include "base/android/jni_string.h" |
11 #include "base/android/scoped_java_ref.h" | 11 #include "base/android/scoped_java_ref.h" |
12 #include "base/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
13 #include "base/stringprintf.h" | 13 #include "base/strings/stringprintf.h" |
14 #include "jni/VideoCapture_jni.h" | 14 #include "jni/VideoCapture_jni.h" |
15 #include "media/base/video_util.h" | 15 #include "media/base/video_util.h" |
16 | 16 |
17 using base::android::AttachCurrentThread; | 17 using base::android::AttachCurrentThread; |
18 using base::android::CheckException; | 18 using base::android::CheckException; |
19 using base::android::GetClass; | 19 using base::android::GetClass; |
20 using base::android::MethodID; | 20 using base::android::MethodID; |
21 using base::android::JavaRef; | 21 using base::android::JavaRef; |
22 using base::android::ScopedJavaLocalRef; | 22 using base::android::ScopedJavaLocalRef; |
23 | 23 |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) { | 255 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) { |
256 LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason; | 256 LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason; |
257 { | 257 { |
258 base::AutoLock lock(lock_); | 258 base::AutoLock lock(lock_); |
259 state_ = kError; | 259 state_ = kError; |
260 } | 260 } |
261 observer_->OnError(); | 261 observer_->OnError(); |
262 } | 262 } |
263 | 263 |
264 } // namespace media | 264 } // namespace media |
OLD | NEW |