| 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" |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 return media::PIXEL_FORMAT_UNKNOWN; | 252 return media::PIXEL_FORMAT_UNKNOWN; |
| 253 } | 253 } |
| 254 } | 254 } |
| 255 | 255 |
| 256 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) { | 256 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) { |
| 257 LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason; | 257 LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason; |
| 258 { | 258 { |
| 259 base::AutoLock lock(lock_); | 259 base::AutoLock lock(lock_); |
| 260 state_ = kError; | 260 state_ = kError; |
| 261 } | 261 } |
| 262 client_->OnError(); | 262 client_->OnError(reason); |
| 263 } | 263 } |
| 264 | 264 |
| 265 } // namespace media | 265 } // namespace media |
| OLD | NEW |