Add support for ZasLuke Capture card (awawa-dev#335)

This grabber is using non-standard low quality codec TJSAMP_420 for MJPEG.
chbartsch · Nov 29, 2022 · b2e5c87 · b2e5c87
1 parent 22c2bda
commit b2e5c87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sources/grabber/MF/MFWorker.cpp b/sources/grabber/MF/MFWorker.cpp
@@ -273,7 +273,7 @@ void MFWorker::process_image_jpg_mt()
 		return;
 	}
 
-	if (_subsamp != TJSAMP_422 && _hdrToneMappingEnabled > 0)
+	if ((_subsamp != TJSAMP_422 && _subsamp != TJSAMP_420) && _hdrToneMappingEnabled > 0)
 	{
 		emit newFrameError(_workerIndex, QString("%1: %2").arg(UNSUPPORTED_DECODER).arg(_subsamp), _currentFrame);
 		return;
@@ -301,7 +301,7 @@ void MFWorker::process_image_jpg_mt()
 			}		
 
 		FrameDecoder::processImage(_cropLeft, _cropRight, _cropTop, _cropBottom,
-			jpegBuffer, _width, _height, _width, PixelFormat::MJPEG, _lutBuffer, image);
+			jpegBuffer, _width, _height, _width, (_subsamp == TJSAMP_422) ? PixelFormat::MJPEG : PixelFormat::I420, _lutBuffer, image);
 
 		free(jpegBuffer);
 	}

diff --git a/sources/grabber/v4l2/V4L2Worker.cpp b/sources/grabber/v4l2/V4L2Worker.cpp
@@ -255,7 +255,7 @@ void V4L2Worker::process_image_jpg_mt()
 		return;
 	}
 
-	if (_subsamp != TJSAMP_422 && _hdrToneMappingEnabled > 0)
+	if ((_subsamp != TJSAMP_422 && _subsamp != TJSAMP_420) && _hdrToneMappingEnabled > 0)
 	{
 		emit newFrameError(_workerIndex, QString("%1: %2").arg(UNSUPPORTED_DECODER).arg(_subsamp), _currentFrame);
 		return;
@@ -283,7 +283,7 @@ void V4L2Worker::process_image_jpg_mt()
 		}
 
 		FrameDecoder::processImage(_cropLeft, _cropRight, _cropTop, _cropBottom,
-			jpegBuffer, _width, _height, _width, PixelFormat::MJPEG, _lutBuffer, image);
+			jpegBuffer, _width, _height, _width, (_subsamp == TJSAMP_422) ? PixelFormat::MJPEG : PixelFormat::I420, _lutBuffer, image);
 
 		free(jpegBuffer);
 	}