From 17888ce0fd71b8261061a3d501de80421a09bc2b Mon Sep 17 00:00:00 2001 From: Florian Echtler Date: Wed, 27 Jun 2018 15:31:53 +0200 Subject: [PATCH] add support for 8-bit greyscale format --- modules/videoio/src/cap_v4l.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/modules/videoio/src/cap_v4l.cpp b/modules/videoio/src/cap_v4l.cpp index adf5524..9af4ebf 100644 --- a/modules/videoio/src/cap_v4l.cpp +++ b/modules/videoio/src/cap_v4l.cpp @@ -440,7 +440,8 @@ static int autosetup_capture_mode_v4l2(CvCaptureCAM_V4L* capture) { V4L2_PIX_FMT_MJPEG, V4L2_PIX_FMT_JPEG, #endif - V4L2_PIX_FMT_Y16 + V4L2_PIX_FMT_Y16, + V4L2_PIX_FMT_GREY }; for (size_t i = 0; i < sizeof(try_order) / sizeof(__u32); i++) { @@ -533,6 +534,7 @@ static int v4l2_num_channels(__u32 palette) { case V4L2_PIX_FMT_MJPEG: case V4L2_PIX_FMT_JPEG: case V4L2_PIX_FMT_Y16: + case V4L2_PIX_FMT_GREY: return 1; case V4L2_PIX_FMT_YUYV: case V4L2_PIX_FMT_UYVY: @@ -1091,6 +1093,13 @@ y16_to_rgb24 (int width, int height, unsigned char* src, unsigned char* dst) cvtColor(gray8,Mat(height, width, CV_8UC3, dst),COLOR_GRAY2BGR); } +static inline void +y8_to_rgb24 (int width, int height, unsigned char* src, unsigned char* dst) +{ + Mat gray8(height, width, CV_8UC1, src); + cvtColor(gray8,Mat(height, width, CV_8UC3, dst),COLOR_GRAY2BGR); +} + #ifdef HAVE_JPEG /* convert from mjpeg to rgb24 */ @@ -1560,6 +1569,18 @@ static IplImage* icvRetrieveFrameCAM_V4L( CvCaptureCAM_V4L* capture, int) { capture->frame.imageSize); } break; + case V4L2_PIX_FMT_GREY: + if(capture->convert_rgb){ + y8_to_rgb24(capture->form.fmt.pix.width, + capture->form.fmt.pix.height, + (unsigned char*)capture->buffers[capture->bufferIndex].start, + (unsigned char*)capture->frame.imageData); + }else{ + memcpy((char *)capture->frame.imageData, + (char *)capture->buffers[capture->bufferIndex].start, + capture->frame.imageSize); + } + break; } if (capture->returnFrame) -- 2.7.4