MF-grabber: Add support for bottom-up image handling (#1752)

* prepare bottom-up image handling

* add default stride handling, code cleaning

* fix code

* move whole logic to MF-grabber

* minor fix

---------

Co-authored-by: Thinner77 <none>

Author: Thinner77

include/grabber/video/mediafoundation/MFGrabber.h

@@ -46,6 +46,7 @@ class MFGrabber : public Grabber
 		int numerator	= 0;
 		int denominator = 0;
 		PixelFormat pf	= PixelFormat::NO_CHANGE;
+		long defstride  = 0;
 		GUID guid		= GUID_NULL;
 	};
 

include/utils/PixelFormat.h

@@ -124,10 +124,10 @@ inline QString pixelFormatToString(const PixelFormat& pixelFormat)
 
 enum class FlipMode
 {
+	NO_CHANGE,
 	HORIZONTAL,
 	VERTICAL,
-	BOTH,
-	NO_CHANGE
+	BOTH
 };
 
 inline FlipMode parseFlipMode(const QString& flipMode)

libsrc/grabber/video/mediafoundation/MFGrabber.cpp

@@ -363,6 +363,18 @@ HRESULT MFGrabber::init_device(QString deviceName, DeviceProperties props)
 		_height = props.height;
 		_frameByteSize = _width * _height * 3;
 		_lineLength = _width * 3;
+		// adjust flipMode for bottom-up images
+		if (props.defstride < 0)
+		{
+			if (_flipMode == FlipMode::NO_CHANGE)
+				_flipMode = FlipMode::HORIZONTAL;
+			else if (_flipMode == FlipMode::HORIZONTAL)
+				_flipMode = FlipMode::NO_CHANGE;
+			else if (_flipMode == FlipMode::VERTICAL)
+				_flipMode = FlipMode::BOTH;
+			else if (_flipMode == FlipMode::BOTH)
+				_flipMode = FlipMode::VERTICAL;
+		}
 	}
 
 	// Cleanup
@@ -436,6 +448,14 @@ void MFGrabber::enumVideoCaptureDevices()
 												properties.denominator = denominator;
 												properties.pf = pixelformat;
 												properties.guid = format;
+
+												HRESULT hr = pType->GetUINT32(MF_MT_DEFAULT_STRIDE, (UINT32*)&properties.defstride);
+												if (FAILED(hr))
+												{
+													hr = MFGetStrideForBitmapInfoHeader(format.Data1, width, &properties.defstride);
+													if (FAILED(hr))
+														DebugIf (verbose, _log, "failed to get default stride");
+												}
 												devicePropertyList.append(properties);
 
 												DebugIf (verbose, _log, "%s %d x %d @ %d fps (%s)", QSTRING_CSTR(dev), properties.width, properties.height, properties.fps, QSTRING_CSTR(pixelFormatToString(properties.pf)));
@@ -797,7 +817,7 @@ QJsonArray MFGrabber::discover(const QJsonObject& params)
 		resolution_default["width"] = 640;
 		resolution_default["height"] = 480;
 		resolution_default["fps"] = 25;
-		format_default["format"] = "bgr24";
+		format_default["format"] = "rgb24";
 		format_default["resolution"] = resolution_default;
 		video_inputs_default["inputIdx"] = 0;
 		video_inputs_default["standards"] = "PAL";