Add P010 HDR10 video format support (signal range is fixed again)

awawa-dev · Nov 8, 2024 · fb07309 · fb07309
1 parent 85d321e
commit fb07309
Show file tree

Hide file tree

Showing 15 changed files with 425 additions and 64 deletions.
diff --git a/include/lut-calibrator/BestResult.h b/include/lut-calibrator/BestResult.h
@@ -80,6 +80,7 @@ struct BestResult
 		double upYLimit = 0;
 		double downYLimit = 0;
 		double yShift = 0;
+		bool isSourceP010 = false;
 	} signal;
 
 	long long int minError = MAX_CALIBRATION_ERROR;
@@ -121,6 +122,7 @@ struct BestResult
 		out << "bestResult.signal.upYLimit = " << std::to_string(signal.upYLimit) << ";" << std::endl;
 		out << "bestResult.signal.downYLimit = " << std::to_string(signal.downYLimit) << ";" << std::endl;
 		out << "bestResult.signal.yShift = " << std::to_string(signal.yShift) << ";" << std::endl;
+		out << "bestResult.signal.isSourceP010 = " << std::to_string(signal.isSourceP010) << ";" << std::endl;
 		out << "bestResult.minError = " << std::to_string(std::round(minError * 100.0) / 30000.0) << ";" << std::endl;
 		out << "*/" << std::endl;
 	}

diff --git a/include/lut-calibrator/BoardUtils.h b/include/lut-calibrator/BoardUtils.h
@@ -61,7 +61,7 @@ namespace BoardUtils
 	constexpr int SCREEN_CRC_LINES = 2;
 	constexpr int SCREEN_CRC_COUNT = 5;
 	constexpr int SCREEN_MAX_CRC_BRIGHTNESS_ERROR = 1;
-	constexpr int SCREEN_MAX_COLOR_NOISE_ERROR = 8;
+	constexpr int SCREEN_MAX_COLOR_NOISE_ERROR = 16;
 	constexpr int SCREEN_SAMPLES_PER_BOARD = (SCREEN_BLOCKS_X / 2) * (SCREEN_BLOCKS_Y - SCREEN_CRC_LINES);
 	const int SCREEN_LAST_BOARD_INDEX = std::pow(SCREEN_COLOR_DIMENSION, 3) / SCREEN_SAMPLES_PER_BOARD;
 

diff --git a/include/lut-calibrator/ColorSpace.h b/include/lut-calibrator/ColorSpace.h
@@ -44,7 +44,7 @@ using namespace aliases;
 
 namespace ColorSpaceMath
 {
-	enum PRIMARIES { SRGB = 0, BT_2020, WIDE_GAMMUT };	
+	enum PRIMARIES { SRGB = 0, BT_2020, WIDE_GAMMUT };
 
 	QString gammaToString(HDR_GAMMA gamma);
 
@@ -85,6 +85,8 @@ namespace ColorSpaceMath
 
 	double3 bt2020_linear_to_nonlinear(double3 input);
 
+	double srgb_nonlinear_to_linear(double input);
+
 	double3 srgb_nonlinear_to_linear(double3 input);
 
 	double3 srgb_linear_to_nonlinear(double3 input);

diff --git a/include/lut-calibrator/LutCalibrator.h b/include/lut-calibrator/LutCalibrator.h
@@ -58,7 +58,7 @@ namespace linalg {
 }
 
 namespace ColorSpaceMath {
-	enum HDR_GAMMA { PQ = 0, HLG, sRGB, BT2020inSRGB, PQinSRGB};
+	enum HDR_GAMMA { PQ = 0, HLG, sRGB, BT2020inSRGB, PQinSRGB, P010 };
 }
 
 struct BestResult;

diff --git a/include/utils/FrameDecoder.h b/include/utils/FrameDecoder.h
@@ -8,17 +8,23 @@
 // some stuff for HDR tone mapping
 #define LUT_INDEX(y,u,v) ((y + (u<<8) + (v<<16))*3)
 
+namespace FrameDecoderUtils
+{	
+	double unpackChromaP010(double x);
+	double unpackLuminanceP010(double val);
+}
+
 class FrameDecoder
 {
 public:
 	static void processImage(
 		int _cropLeft, int _cropRight, int _cropTop, int _cropBottom,
 		const uint8_t* data, const uint8_t* dataUV, int width, int height, int lineLength,
-		const PixelFormat pixelFormat, const uint8_t* lutBuffer, Image<ColorRgb>& outputImage);
+		const PixelFormat pixelFormat, const uint8_t* lutBuffer, Image<ColorRgb>& outputImage, bool toneMapping = true);
 
 	static void processQImage(
 		const uint8_t* data, const uint8_t* dataUV, int width, int height, int lineLength,
-		const PixelFormat pixelFormat, const uint8_t* lutBuffer, Image<ColorRgb>& outputImage);
+		const PixelFormat pixelFormat, const uint8_t* lutBuffer, Image<ColorRgb>& outputImage, bool toneMapping = true);
 
 	static void processSystemImageBGRA(Image<ColorRgb>& image, int targetSizeX, int targetSizeY,
 									   int startX, int startY,

diff --git a/sources/base/Grabber.cpp b/sources/base/Grabber.cpp
@@ -101,7 +101,7 @@ void Grabber::setEnabled(bool enable)
 
 void Grabber::setMonitorNits(int nits)
 {
-	if (_targetMonitorNits != nits)
+	if (static_cast<int>(_targetMonitorNits) != nits)
 	{
 		_targetMonitorNits = nits;
 

diff --git a/sources/grabber/linux/v4l2/V4L2Grabber.cpp b/sources/grabber/linux/v4l2/V4L2Grabber.cpp
@@ -61,17 +61,30 @@
 // some stuff for HDR tone mapping
 #define LUT_FILE_SIZE 50331648
 
+namespace
+{
+	#ifdef V4L2_PIX_FMT_P010
+		#pragma message "P010 is supported on the build machine"
+		bool supportedP010 = true;
+	#else
+		#pragma message "P010 is NOT supported on the build machine"
+		bool supportedP010 = false;
+	#endif
+};
+
+#ifndef V4L2_PIX_FMT_P010
+	#define V4L2_PIX_FMT_P010    v4l2_fourcc('P', '0', '1', '0')
+#endif
+
 static const V4L2Grabber::HyperHdrFormat supportedFormats[] =
 {
 	{ V4L2_PIX_FMT_YUYV,   PixelFormat::YUYV },
 	{ V4L2_PIX_FMT_XRGB32, PixelFormat::XRGB },
 	{ V4L2_PIX_FMT_RGB24,  PixelFormat::RGB24 },
 	{ V4L2_PIX_FMT_YUV420, PixelFormat::I420 },
 	{ V4L2_PIX_FMT_NV12,   PixelFormat::NV12 },
-	{ V4L2_PIX_FMT_MJPEG,  PixelFormat::MJPEG }
-	#ifdef V4L2_PIX_FMT_P010
-		,{ V4L2_PIX_FMT_P010,  PixelFormat::P010 }
-	#endif
+	{ V4L2_PIX_FMT_MJPEG,  PixelFormat::MJPEG },
+	{ V4L2_PIX_FMT_P010,  PixelFormat::P010 }
 };
 
 
@@ -84,6 +97,8 @@ V4L2Grabber::V4L2Grabber(const QString& device, const QString& configurationPath
 {
 	// Refresh devices
 	getV4L2devices();
+
+	Debug(_log, "P010 was %s on the build machine", (supportedP010) ? "supported" : "unsupported");
 }
 
 QString V4L2Grabber::GetSharedLut()
@@ -132,7 +147,8 @@ void V4L2Grabber::setHdrToneMappingEnabled(int mode)
 		{
 			Debug(_log, "setHdrToneMappingMode replacing LUT and restarting");
 			_V4L2WorkerManager.Stop();
-			if ((_actualVideoFormat == PixelFormat::YUYV) || (_actualVideoFormat == PixelFormat::I420) || (_actualVideoFormat == PixelFormat::NV12) || (_actualVideoFormat == PixelFormat::MJPEG))
+			if ((_actualVideoFormat == PixelFormat::YUYV) || (_actualVideoFormat == PixelFormat::I420) || (_actualVideoFormat == PixelFormat::NV12)
+				|| (_actualVideoFormat == PixelFormat::P010) || (_actualVideoFormat == PixelFormat::MJPEG))
 				loadLutFile(PixelFormat::YUYV);
 			else
 				loadLutFile(PixelFormat::RGB24);
@@ -985,6 +1001,16 @@ bool V4L2Grabber::init_device(QString selectedDeviceName, DevicePropertiesItem p
 		}
 		break;
 
+		case V4L2_PIX_FMT_P010:
+		{
+			loadLutFile(PixelFormat::YUYV);
+			_actualVideoFormat = PixelFormat::P010;
+			_frameByteSize = (props.x * props.y * 6) / 2;
+			_lineLength = props.x * 2;
+			Info(_log, "Video pixel format is set to: P010");
+		}
+		break;
+
 		case V4L2_PIX_FMT_NV12:
 		{
 			loadLutFile(PixelFormat::YUYV);

diff --git a/sources/grabber/linux/v4l2/V4L2Worker.cpp b/sources/grabber/linux/v4l2/V4L2Worker.cpp
@@ -201,7 +201,7 @@ void V4L2Worker::runMe()
 			{
 				Image<ColorRgb> image(_width >> 1, _height >> 1);
 				FrameDecoder::processQImage(
-					_sharedData, nullptr, _width, _height, _lineLength, _pixelFormat, _lutBuffer, image);
+					_sharedData, nullptr, _width, _height, _lineLength, _pixelFormat, _lutBuffer, image, _hdrToneMappingEnabled);
 
 				image.setBufferCacheSize();
 				if (!_directAccess)
@@ -222,7 +222,7 @@ void V4L2Worker::runMe()
 
 				FrameDecoder::processImage(
 					_cropLeft, _cropRight, _cropTop, _cropBottom,
-					_sharedData, nullptr, _width, _height, _lineLength, _pixelFormat, _lutBuffer, image);
+					_sharedData, nullptr, _width, _height, _lineLength, _pixelFormat, _lutBuffer, image, _hdrToneMappingEnabled);
 
 				image.setBufferCacheSize();
 				if (!_directAccess)

diff --git a/sources/grabber/windows/MF/MFGrabber.cpp b/sources/grabber/windows/MF/MFGrabber.cpp
@@ -189,7 +189,7 @@ void MFGrabber::setHdrToneMappingEnabled(int mode)
 		{
 			Debug(_log, "setHdrToneMappingMode replacing LUT and restarting");
 			_MFWorkerManager.Stop();
-			if ((_actualVideoFormat == PixelFormat::YUYV) || (_actualVideoFormat == PixelFormat::I420) || (_actualVideoFormat == PixelFormat::NV12) || (_actualVideoFormat == PixelFormat::MJPEG))
+			if ((_actualVideoFormat == PixelFormat::YUYV) || (_actualVideoFormat == PixelFormat::I420) || (_actualVideoFormat == PixelFormat::P010) || (_actualVideoFormat == PixelFormat::NV12) || (_actualVideoFormat == PixelFormat::MJPEG))
 				loadLutFile(PixelFormat::YUYV);
 			else
 				loadLutFile(PixelFormat::RGB24);
@@ -869,6 +869,14 @@ bool MFGrabber::init_device(QString selectedDeviceName, DevicePropertiesItem pro
 		}
 		break;
 
+		case PixelFormat::P010:
+		{
+			loadLutFile(PixelFormat::YUYV);
+			_frameByteSize = (6 * props.x * props.y) / 2;
+			_lineLength = props.x * 2;
+		}
+		break;
+
 		case PixelFormat::RGB24:
 		{
 			loadLutFile(PixelFormat::RGB24);

diff --git a/sources/grabber/windows/MF/MFWorker.cpp b/sources/grabber/windows/MF/MFWorker.cpp
@@ -199,7 +199,7 @@ void MFWorker::runMe()
 			{
 				Image<ColorRgb> image(_width >> 1, _height >> 1);
 				FrameDecoder::processQImage(
-					_localBuffer.data(), nullptr, _width, _height, _lineLength, _pixelFormat, _lutBuffer, image);
+					_localBuffer.data(), nullptr, _width, _height, _lineLength, _pixelFormat, _lutBuffer, image, _hdrToneMappingEnabled);
 
 				image.setBufferCacheSize();
 				if (!_directAccess)
@@ -218,7 +218,7 @@ void MFWorker::runMe()
 
 				FrameDecoder::processImage(
 					_cropLeft, _cropRight, _cropTop, _cropBottom,
-					_localBuffer.data(), nullptr, _width, _height, _lineLength, _pixelFormat, _lutBuffer, image);
+					_localBuffer.data(), nullptr, _width, _height, _lineLength, _pixelFormat, _lutBuffer, image, _hdrToneMappingEnabled);
 
 				image.setBufferCacheSize();
 				if (!_directAccess)

diff --git a/sources/lut-calibrator/ColorSpace.cpp b/sources/lut-calibrator/ColorSpace.cpp
@@ -76,6 +76,8 @@ namespace ColorSpaceMath
 			return "BT2020 with sRGB TRC";
 		else if (gamma == HDR_GAMMA::PQinSRGB)
 			return "PQ in SRGB";
+		else if (gamma == HDR_GAMMA::P010)
+			return "P010";
 		return "UNKNOWN";
 	}