blob: 6b494af58f3a746f5bd2f475d71e30e7ebfa5256 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
--- media/capture/video/video_capture_device.cc.orig 2015-12-04 22:51:59.984494000 +0100
+++ media/capture/video/video_capture_device.cc 2015-12-04 22:53:28.114262000 +0100
@@ -11,6 +11,10 @@
namespace media {
+const std::string VideoCaptureDevice::Name::GetModel() const {
+ return "";
+}
+
// TODO(msu.koo): http://crbug.com/532272, remove checking the switch in favour
// of deferring GetModel() call to the actual VideoCaptureDevice object.
const std::string VideoCaptureDevice::Name::GetNameAndModel() const {
@@ -33,7 +37,7 @@
: device_name_(name), unique_id_(id) {
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
VideoCaptureDevice::Name::Name(const std::string& name,
const std::string& id,
const CaptureApiType api_type)
@@ -80,7 +84,7 @@
VideoCaptureDevice::Name::~Name() {
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const {
switch (capture_api_type()) {
case V4L2_SINGLE_PLANE:
|
