RGB24 and BGR24 cleanup (#1749)

Lord-Grey · web-flow · commit 15c305b8f24d · 2024-06-01T20:26:20.000+02:00
* RGB24 and BGR24 cleanup * Fix MF-Grabber * Add BGR32 to V42L Grabber * Add BGR32 to V42L Grabber * Add BGR16 to V42L * Revert "Add BGR16 to V42L" This reverts commit 4297538.
diff --git a/include/utils/PixelFormat.h b/include/utils/PixelFormat.h
@@ -10,6 +10,7 @@ enum class PixelFormat {
 	YUYV,
 	UYVY,
 	BGR16,
+	RGB24,
 	BGR24,
 	RGB32,
 	BGR32,
@@ -36,6 +37,10 @@ inline PixelFormat parsePixelFormat(const QString& pixelFormat)
 	{
 		return PixelFormat::BGR16;
 	}
+	else if (format.compare("rgb24")  == 0)
+	{
+		return PixelFormat::RGB24;
+	}
 	else if (format.compare("bgr24")  == 0)
 	{
 		return PixelFormat::BGR24;
@@ -80,6 +85,10 @@ inline QString pixelFormatToString(const PixelFormat& pixelFormat)
 	{
 		return "BGR16";
 	}
+	else if (pixelFormat == PixelFormat::RGB24)
+	{
+		return "RGB24";
+	}
 	else if (pixelFormat == PixelFormat::BGR24)
 	{
 		return "BGR24";
diff --git a/libsrc/grabber/video/mediafoundation/MFSourceReaderCB.h b/libsrc/grabber/video/mediafoundation/MFSourceReaderCB.h
@@ -27,7 +27,7 @@
 static PixelFormat GetPixelFormatForGuid(const GUID guid)
 {
 	if (IsEqualGUID(guid, MFVideoFormat_RGB32)) return PixelFormat::RGB32;
-	if (IsEqualGUID(guid, MFVideoFormat_RGB24)) return PixelFormat::BGR24;
+	if (IsEqualGUID(guid, MFVideoFormat_RGB24)) return PixelFormat::RGB24;
 	if (IsEqualGUID(guid, MFVideoFormat_YUY2)) return PixelFormat::YUYV;
 	if (IsEqualGUID(guid, MFVideoFormat_UYVY)) return PixelFormat::UYVY;
 #ifdef HAVE_TURBO_JPEG
@@ -145,9 +145,9 @@ class SourceReaderCB : public IMFSourceReaderCallback
 		}
 
 #ifdef HAVE_TURBO_JPEG
-		if (_pixelformat != PixelFormat::MJPEG && _pixelformat != PixelFormat::BGR24 && _pixelformat != PixelFormat::NO_CHANGE)
+		if (_pixelformat != PixelFormat::MJPEG && _pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::NO_CHANGE)
 #else
-		if (_pixelformat != PixelFormat::BGR24 && _pixelformat != PixelFormat::NO_CHANGE)
+		if (_pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::NO_CHANGE)
 #endif
 			pSample = TransformSample(_transform, pSample);
 
@@ -181,9 +181,9 @@ class SourceReaderCB : public IMFSourceReaderCallback
 			_bEOS = TRUE; // Reached the end of the stream.
 
 #ifdef HAVE_TURBO_JPEG
-		if (_pixelformat != PixelFormat::MJPEG && _pixelformat != PixelFormat::BGR24 && _pixelformat != PixelFormat::NO_CHANGE)
+		if (_pixelformat != PixelFormat::MJPEG && _pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::NO_CHANGE)
 #else
-		if (_pixelformat != PixelFormat::BGR24 && _pixelformat != PixelFormat::NO_CHANGE)
+		if (_pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::NO_CHANGE)
 #endif
 			SAFE_RELEASE(pSample);
 
@@ -196,9 +196,9 @@ class SourceReaderCB : public IMFSourceReaderCallback
 	{
 		_pixelformat = format;
 #ifdef HAVE_TURBO_JPEG
-		if (format == PixelFormat::MJPEG || format == PixelFormat::BGR24 || format == PixelFormat::NO_CHANGE)
+		if (format == PixelFormat::MJPEG || format == PixelFormat::RGB24 || format == PixelFormat::NO_CHANGE)
 #else
-		if (format == PixelFormat::BGR24 || format == PixelFormat::NO_CHANGE)
+		if (format == PixelFormat::RGB24 || format == PixelFormat::NO_CHANGE)
 #endif
 			return S_OK;
 
@@ -392,10 +392,10 @@ class SourceReaderCB : public IMFSourceReaderCallback
 private:
 	long				_nRefCount;
 	CRITICAL_SECTION	_critsec;
-	MFGrabber*			_grabber;
+	MFGrabber* _grabber;
 	BOOL				_bEOS;
 	HRESULT				_hrStatus;
-	IMFTransform*		_transform;
+	IMFTransform* _transform;
 	PixelFormat			_pixelformat;
 	std::atomic<bool>	_isBusy;
 };
diff --git a/libsrc/grabber/video/v4l2/V4L2Grabber.cpp b/libsrc/grabber/video/v4l2/V4L2Grabber.cpp
@@ -54,6 +54,8 @@ Q_GLOBAL_STATIC_WITH_ARGS(ControlIDPropertyMap, _controlIDPropertyMap, (initCont
 static PixelFormat GetPixelFormat(const unsigned int format)
 {
 	if (format == V4L2_PIX_FMT_RGB32) return PixelFormat::RGB32;
+	if (format == V4L2_PIX_FMT_BGR32) return PixelFormat::BGR32;
+	if (format == V4L2_PIX_FMT_RGB24) return PixelFormat::RGB24;
 	if (format == V4L2_PIX_FMT_BGR24) return PixelFormat::BGR24;
 	if (format == V4L2_PIX_FMT_YUYV) return PixelFormat::YUYV;
 	if (format == V4L2_PIX_FMT_UYVY) return PixelFormat::UYVY;
@@ -557,6 +559,14 @@ void V4L2Grabber::init_device(VideoStandard videoStandard)
 			fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_RGB32;
 		break;
 
+		case PixelFormat::BGR32:
+			fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR32;
+			break;
+
+		case PixelFormat::RGB24:
+			fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_RGB24;
+		break;
+
 		case PixelFormat::BGR24:
 			fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24;
 		break;
@@ -691,6 +701,22 @@ void V4L2Grabber::init_device(VideoStandard videoStandard)
 		}
 		break;
 
+		case V4L2_PIX_FMT_BGR32:
+		{
+			_pixelFormat = PixelFormat::BGR32;
+			_frameByteSize = _width * _height * 4;
+			Debug(_log, "Pixel format=BGR32");
+		}
+		break;
+
+		case V4L2_PIX_FMT_RGB24:
+		{
+			_pixelFormat = PixelFormat::RGB24;
+			_frameByteSize = _width * _height * 3;
+			Debug(_log, "Pixel format=RGB24");
+		}
+		break;
+
 		case V4L2_PIX_FMT_BGR24:
 		{
 			_pixelFormat = PixelFormat::BGR24;
@@ -699,7 +725,6 @@ void V4L2Grabber::init_device(VideoStandard videoStandard)
 		}
 		break;
 
-
 		case V4L2_PIX_FMT_YUYV:
 		{
 			_pixelFormat = PixelFormat::YUYV;
@@ -743,9 +768,9 @@ void V4L2Grabber::init_device(VideoStandard videoStandard)
 
 		default:
 #ifdef HAVE_TURBO_JPEG
-			throw_exception("Only pixel formats RGB32, BGR24, YUYV, UYVY, NV12, I420 and MJPEG are supported");
+			throw_exception("Only pixel formats RGB32, BGR32, RGB24, BGR24, YUYV, UYVY, NV12, I420 and MJPEG are supported");
 #else
-			throw_exception("Only pixel formats RGB32, BGR24, YUYV, UYVY, NV12 and I420 are supported");
+			throw_exception("Only pixel formats RGB32, BGR32, RGB24, BGR24, YUYV, UYVY, NV12 and I420 are supported");
 #endif
 		return;
 	}
diff --git a/libsrc/utils/ImageResampler.cpp b/libsrc/utils/ImageResampler.cpp
@@ -133,6 +133,22 @@ void ImageResampler::processImage(const uint8_t * data, int width, int height, i
 			break;
 		}
 
+		case PixelFormat::RGB24:
+		{
+			for (int yDest = yDestStart, ySource = cropTop + (_verticalDecimation >> 1); yDest <= yDestEnd; ySource += _verticalDecimation, ++yDest)
+			{
+				for (int xDest = xDestStart, xSource = cropLeft + (_horizontalDecimation >> 1); xDest <= xDestEnd; xSource += _horizontalDecimation, ++xDest)
+				{
+					ColorRgb & rgb = outputImage(abs(xDest), abs(yDest));
+					int index = lineLength * ySource + (xSource << 1) + xSource;
+					rgb.red   = data[index  ];
+					rgb.green = data[index+1];
+					rgb.blue  = data[index+2];
+				}
+			}
+			break;
+		}
+
 		case PixelFormat::BGR24:
 		{
 			for (int yDest = yDestStart, ySource = cropTop + (_verticalDecimation >> 1); yDest <= yDestEnd; ySource += _verticalDecimation, ++yDest)

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ enum class PixelFormat {`
`10`	`10`	`YUYV,`
`11`	`11`	`UYVY,`
`12`	`12`	`BGR16,`
	`13`	`+ RGB24,`
`13`	`14`	`BGR24,`
`14`	`15`	`RGB32,`
`15`	`16`	`BGR32,`
`@@ -36,6 +37,10 @@ inline PixelFormat parsePixelFormat(const QString& pixelFormat)`
`36`	`37`	`{`
`37`	`38`	`return PixelFormat::BGR16;`
`38`	`39`	`}`
	`40`	`+ else if (format.compare("rgb24") == 0)`
	`41`	`+ {`
	`42`	`+ return PixelFormat::RGB24;`
	`43`	`+ }`
`39`	`44`	`else if (format.compare("bgr24") == 0)`
`40`	`45`	`{`
`41`	`46`	`return PixelFormat::BGR24;`
`@@ -80,6 +85,10 @@ inline QString pixelFormatToString(const PixelFormat& pixelFormat)`
`80`	`85`	`{`
`81`	`86`	`return "BGR16";`
`82`	`87`	`}`
	`88`	`+ else if (pixelFormat == PixelFormat::RGB24)`
	`89`	`+ {`
	`90`	`+ return "RGB24";`
	`91`	`+ }`
`83`	`92`	`else if (pixelFormat == PixelFormat::BGR24)`
`84`	`93`	`{`
`85`	`94`	`return "BGR24";`