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

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

Issue 24079003: Add VideoCaptureDevice::GetDeviceSupportedFormats to interface + implementation for Linux and Fake (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: perkj@'s nits Created 7 years, 2 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
« no previous file with comments | « no previous file | media/video/capture/fake_video_capture_device.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 DVLOG(1) << "VideoCaptureDevice::GetDeviceNames: camera device_name=" 47 DVLOG(1) << "VideoCaptureDevice::GetDeviceNames: camera device_name="
48 << name.name() 48 << name.name()
49 << ", unique_id=" 49 << ", unique_id="
50 << name.id() 50 << name.id()
51 << ", orientation " 51 << ", orientation "
52 << Java_ChromiumCameraInfo_getOrientation(env, ci.obj()); 52 << Java_ChromiumCameraInfo_getOrientation(env, ci.obj());
53 } 53 }
54 } 54 }
55 55
56 // static
57 void VideoCaptureDevice::GetDeviceSupportedFormats(const Name& device,
58 VideoCaptureCapabilities* formats) {
59 NOTIMPLEMENTED();
60 }
61
56 const std::string VideoCaptureDevice::Name::GetModel() const { 62 const std::string VideoCaptureDevice::Name::GetModel() const {
57 // Android cameras are not typically USB devices, and this method is currently 63 // Android cameras are not typically USB devices, and this method is currently
58 // only used for USB model identifiers, so this implementation just indicates 64 // only used for USB model identifiers, so this implementation just indicates
59 // an unknown device model. 65 // an unknown device model.
60 return ""; 66 return "";
61 } 67 }
62 68
63 // static 69 // static
64 VideoCaptureDevice* VideoCaptureDevice::Create(const Name& device_name) { 70 VideoCaptureDevice* VideoCaptureDevice::Create(const Name& device_name) {
65 return VideoCaptureDeviceAndroid::Create(device_name); 71 return VideoCaptureDeviceAndroid::Create(device_name);
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) { 262 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) {
257 LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason; 263 LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason;
258 { 264 {
259 base::AutoLock lock(lock_); 265 base::AutoLock lock(lock_);
260 state_ = kError; 266 state_ = kError;
261 } 267 }
262 client_->OnError(); 268 client_->OnError();
263 } 269 }
264 270
265 } // namespace media 271 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | media/video/capture/fake_video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698