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.cc12
1 files changed, 6 insertions, 6 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
index 695e2db1e623..29627ff02d06 100644
--- 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
@@ -1,4 +1,4 @@
---- media/capture/video/linux/video_capture_device_linux.cc.orig 2017-04-19 19:06:35 UTC
+--- media/capture/video/linux/video_capture_device_linux.cc.orig 2017-06-05 19:03:08 UTC
+++ media/capture/video/linux/video_capture_device_linux.cc
@@ -21,6 +21,7 @@
@@ -8,7 +8,7 @@
// Translates Video4Linux pixel formats to Chromium pixel formats.
// static
VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
-@@ -34,6 +35,7 @@ std::list<uint32_t> VideoCaptureDeviceLi
+@@ -34,6 +35,7 @@ std::list<uint32_t> VideoCaptureDeviceLinux::GetListOf
bool favour_mjpeg) {
return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg);
}
@@ -16,7 +16,7 @@
VideoCaptureDeviceLinux::VideoCaptureDeviceLinux(
const VideoCaptureDeviceDescriptor& device_descriptor)
-@@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe
+@@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDeviceLinux() {
v4l2_thread_.Stop();
}
@@ -24,7 +24,7 @@
void VideoCaptureDeviceLinux::AllocateAndStart(
const VideoCaptureParams& params,
std::unique_ptr<VideoCaptureDevice::Client> client) {
-@@ -74,7 +77,13 @@ void VideoCaptureDeviceLinux::AllocateAn
+@@ -74,7 +77,13 @@ void VideoCaptureDeviceLinux::AllocateAndStart(
v4l2_thread_.task_runner()->PostTask(FROM_HERE, request);
photo_requests_queue_.clear();
}
@@ -38,7 +38,7 @@
void VideoCaptureDeviceLinux::StopAndDeAllocate() {
if (!v4l2_thread_.IsRunning())
return; // Wrong state.
-@@ -123,7 +132,11 @@ void VideoCaptureDeviceLinux::SetPhotoOp
+@@ -123,7 +132,11 @@ void VideoCaptureDeviceLinux::SetPhotoOptions(
}
v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(functor));
}
@@ -50,7 +50,7 @@
void VideoCaptureDeviceLinux::SetRotation(int rotation) {
if (v4l2_thread_.IsRunning()) {
v4l2_thread_.task_runner()->PostTask(
-@@ -131,6 +144,9 @@ void VideoCaptureDeviceLinux::SetRotatio
+@@ -131,6 +144,9 @@ void VideoCaptureDeviceLinux::SetRotation(int rotation
base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation));
}
}