--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig 2021-12-15 16:12:54 UTC +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" +#if !defined(OS_BSD) #include #include +#endif #include #include #include @@ -13,7 +15,7 @@ #include -#if !defined(OS_OPENBSD) +#if !defined(OS_BSD) #include #endif @@ -28,10 +30,10 @@ using media::mojom::MeteringMode; using media::mojom::MeteringMode; -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) +// #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) // 16 bit depth, Realsense F200. #define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ') -#endif +// #endif // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. @@ -341,9 +343,9 @@ void V4L2CaptureDelegate::AllocateAndStart( // operation (|errno| == EINVAL in this case) or plain failure. if ((power_line_frequency_ == V4L2_CID_POWER_LINE_FREQUENCY_50HZ) || (power_line_frequency_ == V4L2_CID_POWER_LINE_FREQUENCY_60HZ) -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) - || (power_line_frequency_ == V4L2_CID_POWER_LINE_FREQUENCY_AUTO) -#endif +//#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) +// || (power_line_frequency_ == V4L2_CID_POWER_LINE_FREQUENCY_AUTO) +//#endif ) { struct v4l2_control control = {}; control.id = V4L2_CID_POWER_LINE_FREQUENCY;