aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc')
-rw-r--r--www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc62
1 files changed, 62 insertions, 0 deletions
diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
new file mode 100644
index 000000000000..4a662aeb8da0
--- /dev/null
+++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
@@ -0,0 +1,62 @@
+--- media/capture/video/linux/video_capture_device_linux.cc.orig 2016-05-11 19:02:23 UTC
++++ media/capture/video/linux/video_capture_device_linux.cc
+@@ -44,6 +44,7 @@ static bool ReadIdFile(const std::string
+ return true;
+ }
+
++#if !defined(OS_FREEBSD)
+ // Translates Video4Linux pixel formats to Chromium pixel formats.
+ // static
+ VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
+@@ -57,6 +58,7 @@ std::list<uint32_t> VideoCaptureDeviceLi
+ bool favour_mjpeg) {
+ return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg);
+ }
++#endif // !defined(OS_FREEBSD)
+
+ const std::string VideoCaptureDevice::Name::GetModel() const {
+ // |unique_id| is of the form "/dev/video2". |file_name| is "video2".
+@@ -90,6 +92,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe
+ v4l2_thread_.Stop();
+ }
+
++#if !defined(OS_FREEBSD)
+ void VideoCaptureDeviceLinux::AllocateAndStart(
+ const VideoCaptureParams& params,
+ scoped_ptr<VideoCaptureDevice::Client> client) {
+@@ -113,7 +116,13 @@ void VideoCaptureDeviceLinux::AllocateAn
+ params.requested_format.frame_size.height(),
+ params.requested_format.frame_rate, base::Passed(&client)));
+ }
++#else // !defined(OS_FREEBSD)
++void VideoCaptureDeviceLinux::AllocateAndStart(
++ const VideoCaptureParams& params,
++ scoped_ptr<VideoCaptureDevice::Client> client) {}
++#endif // !defined(OS_FREEBSD)
+
++#if !defined(OS_FREEBSD)
+ void VideoCaptureDeviceLinux::StopAndDeAllocate() {
+ if (!v4l2_thread_.IsRunning())
+ return; // Wrong state.
+@@ -124,7 +133,11 @@ void VideoCaptureDeviceLinux::StopAndDeA
+
+ capture_impl_ = NULL;
+ }
++#else // !defined(OS_FREEBSD)
++void VideoCaptureDeviceLinux::StopAndDeAllocate() {}
++#endif // !defined(OS_FREEBSD)
+
++#if !defined(OS_FREEBSD)
+ void VideoCaptureDeviceLinux::SetRotation(int rotation) {
+ if (v4l2_thread_.IsRunning()) {
+ v4l2_thread_.message_loop()->PostTask(
+@@ -132,6 +145,9 @@ void VideoCaptureDeviceLinux::SetRotatio
+ base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation));
+ }
+ }
++#else // !defined(OS_FREEBSD)
++void VideoCaptureDeviceLinux::SetRotation(int rotation) {}
++#endif // !defined(OS_FREEBSD)
+
+ // static
+ int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(