Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(786)

Side by Side Diff: media/video/capture/android/video_capture_device_android.cc

Issue 489183003: Log error messages in windows video capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge conflicts? Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 return media::PIXEL_FORMAT_YV12; 183 return media::PIXEL_FORMAT_YV12;
184 case ANDROID_IMAGEFORMAT_NV21: 184 case ANDROID_IMAGEFORMAT_NV21:
185 return media::PIXEL_FORMAT_NV21; 185 return media::PIXEL_FORMAT_NV21;
186 case ANDROID_IMAGEFORMAT_UNKNOWN: 186 case ANDROID_IMAGEFORMAT_UNKNOWN:
187 default: 187 default:
188 return media::PIXEL_FORMAT_UNKNOWN; 188 return media::PIXEL_FORMAT_UNKNOWN;
189 } 189 }
190 } 190 }
191 191
192 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) { 192 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) {
193 LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason;
194 { 193 {
195 base::AutoLock lock(lock_); 194 base::AutoLock lock(lock_);
196 state_ = kError; 195 state_ = kError;
197 } 196 }
198 client_->OnError(reason); 197 client_->OnError(reason);
199 } 198 }
200 199
201 } // namespace media 200 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698