Adjustment merge + new brightness settings (#359)

* add new rgbtransform

* activate rgbtransform

* integrate new transform and gamma in adjustment, disable transform

* fix brighness limit

* advance upper and lower thresholds

* start removing color transform

* adjust configs/schema

* implement json for new color adjustment

* finish hyperion-remote extension for new adjustment settings

* fix typos

* rename luminance to brightness
fix jsonapi for new adjustment

* fix some bugs in adjustments

* fix i18n

* fix gamma via json

* now brighness values goes from 0-1 with 0.5 is the default for all brighness is equal between the channels. less 0.5 all channels scaled down
to new brighness, above 0.5 if possible channel gets brighter - but brighness is not equal between the channels anymore
brighness value curve is now exponential instead of linear - this feels more natural

* hslv cleanup

Author: redPanther

assets/webconfig/i18n/de.json

@@ -314,6 +314,11 @@
 		"edt_conf_color_cyan" : "Cyan",
 		"edt_conf_color_magenta" : "Magenta",
 		"edt_conf_color_yellow" : "Gelb",
+		"edt_conf_color_gamma_red" : "Gamma rot",
+		"edt_conf_color_gamma_green" : "Gamma grün",
+		"edt_conf_color_gamma_blue" : "Gamma blau",
+		"edt_conf_color_brightness_min" : "Minimale Helligkeit",
+		"edt_conf_color_brightness" : "Maximale Helligkeit",
 		"edt_conf_smooth_heading_title" : "Glättung",
 		"edt_conf_smooth_type_title" : "Art",
 		"edt_conf_smooth_type_expl" : "Algorithmus der Glättung.",

assets/webconfig/i18n/en.json

@@ -315,6 +315,11 @@
 		"edt_conf_color_cyan" : "cyan",
 		"edt_conf_color_magenta" : "magenta",
 		"edt_conf_color_yellow" : "yellow",
+		"edt_conf_color_gamma_red" : "gamma red",
+		"edt_conf_color_gamma_green" : "gamma green",
+		"edt_conf_color_gamma_blue" : "gamma blue",
+		"edt_conf_color_brightness_min" : "minimal brightness",
+		"edt_conf_color_brightness" : "maximal brightness",
 		"edt_conf_smooth_heading_title" : "Smoothing",
 		"edt_conf_smooth_type_title" : "Type",
 		"edt_conf_smooth_type_expl" : "Type of smoothing.",

config/hyperion.config.json.commented

@@ -81,37 +81,12 @@
 				"blue"    : [0,0,255],
 				"cyan"    : [0,255,255],
 				"magenta" : [255,0,255],
-				"yellow"  : [255,255,0]
-			}
-		],
-		"transform_enable" : true,
-		"transform_v4l_only" : false,
-		"transform" :
-		[
-			{
-				"id"   : "default",
-				"leds" : "*",
-				"hsl" :
-				{
-					"saturationGain"   : 1.0000,
-					"luminanceGain"    : 1.0000,
-					"luminanceMinimum" : 0.0000
-				},
-				"red" :
-				{
-					"threshold" : 0.0000,
-					"gamma"     : 2.5000
-				},
-				"green" :
-				{
-					"threshold" : 0.0000,
-					"gamma"     : 2.5000
-				},
-				"blue" :
-				{
-					"threshold" : 0.0000,
-					"gamma"     : 2.5000
-				}
+				"yellow"  : [255,255,0],
+				"gammaRed"   : 1.0,
+				"gammaGreen" : 1.0,
+				"gammaBlue"  : 1.0,
+				"brightnessMin"  : 0.0,
+				"brightness" : 0.5
 			}
 		]
 	},

config/hyperion.config.json.default

@@ -36,37 +36,12 @@
 				"blue"    : [0,0,255],
 				"cyan"    : [0,255,255],
 				"magenta" : [255,0,255],
-				"yellow"  : [255,255,0]
-			}
-		],
-		"transform_enable" : true,
-		"transform_v4l_only" : false,
-		"transform" :
-		[
-			{
-				"id"   : "default",
-				"leds" : "*",
-				"hsl" :
-				{
-					"saturationGain"   : 1.0000,
-					"luminanceGain"    : 1.0000,
-					"luminanceMinimum" : 0.0000
-				},
-				"red" :
-				{
-					"threshold" : 0.0000,
-					"gamma"     : 2.5000
-				},
-				"green" :
-				{
-					"threshold" : 0.0000,
-					"gamma"     : 2.5000
-				},
-				"blue" :
-				{
-					"threshold" : 0.0000,
-					"gamma"     : 2.5000
-				}
+				"yellow"  : [255,255,0],
+				"gammaRed"   : 1.0,
+				"gammaGreen" : 1.0,
+				"gammaBlue"  : 1.0,
+				"brightnessMin"  : 0.0,
+				"brightness" : 0.5
 			}
 		]
 	},

include/hyperion/ColorAdjustment.h

@@ -5,6 +5,7 @@
 
 // Utils includes
 #include <utils/RgbChannelAdjustment.h>
+#include <utils/RgbTransform.h>
 
 class ColorAdjustment
 {
@@ -29,4 +30,6 @@ class ColorAdjustment
 	RgbChannelAdjustment _rgbMagentaAdjustment;
 	/// The YELLOW (RGB-Channel) adjustment
 	RgbChannelAdjustment _rgbYellowAdjustment;
+
+	RgbTransform _rgbTransform;
 };

include/hyperion/ColorTransform.h

@@ -22,7 +22,6 @@
 // Hyperion includes
 #include <hyperion/LedString.h>
 #include <hyperion/PriorityMuxer.h>
-#include <hyperion/ColorTransform.h>
 #include <hyperion/ColorAdjustment.h>
 #include <hyperion/MessageForwarder.h>
 #include <hyperion/ComponentRegister.h>
@@ -38,13 +37,9 @@
 // Forward class declaration
 class LedDevice;
 class LinearColorSmoothing;
-class ColorTransform;
+class RgbTransform;
 class EffectEngine;
-class HsvTransform;
-class HslTransform;
-class RgbChannelTransform;
 class RgbChannelAdjustment;
-class MultiColorTransform;
 class MultiColorAdjustment;
 class KODIVideoChecker;
 ///
@@ -67,14 +62,6 @@ class Hyperion : public QObject
 		BLACK, WHITE, RED, GREEN, BLUE, CYAN, MAGENTA, YELLOW, INVALID
 	};
 
-	///
-	/// Enumeration of the possible color (color-channel) transforms
-	///
-	enum Transform
-	{
-		SATURATION_GAIN, VALUE_GAIN, THRESHOLD, GAMMA, BLACKLEVEL, WHITELEVEL
-	};
-
 	///
 	/// Destructor; cleans up resources
 	///
@@ -216,23 +203,11 @@ public slots:
 	///
 	void setImage(int priority, const Image<ColorRgb> & image, int duration_ms);
 
-	///
-	/// Returns the list with unique transform identifiers
-	/// @return The list with transform identifiers
-	///
-	const std::vector<std::string> & getTransformIds() const;
-
 	///
 	/// Returns the list with unique adjustment identifiers
 	/// @return The list with adjustment identifiers
 	///
 	const std::vector<std::string> & getAdjustmentIds() const;
-	
-	///
-	/// Returns the ColorTransform with the given identifier
-	/// @return The transform with the given identifier (or nullptr if the identifier does not exist)
-	///
-	ColorTransform * getTransform(const std::string& id);
 
 	///
 	/// Returns the ColorAdjustment with the given identifier
@@ -246,9 +221,6 @@ public slots:
 	///
 	MessageForwarder * getForwarder();
 
-	/// Tell Hyperion that the transforms have changed and the leds need to be updated
-	void transformsUpdated();
-
 	/// Tell Hyperion that the corrections have changed and the leds need to be updated
 	void adjustmentsUpdated();
 
@@ -295,14 +267,9 @@ public slots:
 	static LedString createLedString(const QJsonValue & ledsConfig, const ColorOrder deviceOrder);
 	static LedString createLedStringClone(const QJsonValue & ledsConfig, const ColorOrder deviceOrder);
 
-	static MultiColorTransform * createLedColorsTransform(const unsigned ledCnt, const QJsonObject & colorTransformConfig);
 	static MultiColorAdjustment * createLedColorsAdjustment(const unsigned ledCnt, const QJsonObject & colorAdjustmentConfig);
-	static ColorTransform * createColorTransform(const QJsonObject & transformConfig);
 	static ColorAdjustment * createColorAdjustment(const QJsonObject & adjustmentConfig);
-	static HsvTransform * createHsvTransform(const QJsonObject & hsvConfig);
-	static HslTransform * createHslTransform(const QJsonObject & hslConfig);
-	static RgbChannelTransform * createRgbChannelTransform(const QJsonObject& colorConfig);
-	static RgbChannelAdjustment * createRgbChannelCorrection(const QJsonObject& colorConfig);
+	static RgbTransform * createRgbTransform(const QJsonObject& colorConfig);
 	static RgbChannelAdjustment * createRgbChannelAdjustment(const QJsonArray& colorConfig, const RgbChannel color);
 
 	static LinearColorSmoothing * createColorSmoothing(const QJsonObject & smoothingConfig, LedDevice* leddevice);
@@ -349,9 +316,6 @@ private slots:
 	/// The priority muxer
 	PriorityMuxer _muxer;
 
-	/// The transformation from raw colors to led colors
-	MultiColorTransform * _raw2ledTransform;
-
 	/// The adjustment from raw colors to led colors
 	MultiColorAdjustment * _raw2ledAdjustment;
 
@@ -393,12 +357,6 @@ private slots:
 	/// flag for v4l color correction
 	bool _colorAdjustmentV4Lonly;
 
-	/// flag for v4l color correction
-	bool _colorTransformV4Lonly;
-	
-	/// flag for color transform enable
-	bool _transformEnabled;
-
 	/// flag for color adjustment enable
 	bool _adjustmentEnabled;
 

include/hyperion/Hyperion.h

@@ -4,68 +4,36 @@
 #include <cstdint>
 
 ///
-/// Color transformation to adjust the saturation and value of a RGB color value
+/// Color transformation to adjust the saturation and luminance of a RGB color value
 ///
-class HsvTransform
+class ColorSys
 {
 public:
 	///
-	/// Default constructor
+	///	Translates an RGB (red, green, blue) color to an HSL (hue, saturation, luminance) color
 	///
-	HsvTransform();
-
-	///
-	/// Constructor
-	///
-	/// @param saturationGain The used saturation gain
-	/// @param valueGain The used value gain
-	///
-	HsvTransform(double saturationGain, double valueGain);
-
-	///
-	/// Destructor
-	///
-	~HsvTransform();
-
-	///
-	/// Updates the saturation gain
-	///
-	/// @param saturationGain New saturationGain
-	///
-	void setSaturationGain(double saturationGain);
-
-	///
-	/// Returns the saturation gain
-	///
-	/// @return The current Saturation gain
-	///
-	double getSaturationGain() const;
-
-	///
-	/// Updates the value gain
-	///
-	/// @param valueGain New value gain
+	/// @param[in] red The red RGB-component
+	/// @param[in] green The green RGB-component
+	/// @param[in] blue The blue RGB-component
+	/// @param[out] hue The hue HSL-component
+	/// @param[out] saturation The saturation HSL-component
+	/// @param[out] luminance The luminance HSL-component
 	///
-	void setValueGain(double valueGain);
 
-	///
-	/// Returns the value gain
-	///
-	/// @return The current value gain
-	///
-	double getValueGain() const;
+	static void rgb2hsl(uint8_t red, uint8_t green, uint8_t blue, uint16_t & hue, float & saturation, float & luminance);
 
 	///
-	/// Apply the transform the the given RGB values.
+	///	Translates an HSL (hue, saturation, luminance) color to an RGB (red, green, blue) color
 	///
-	/// @param red The red color component
-	/// @param green The green color component
-	/// @param blue The blue color component
-	///
-	/// @note The values are updated in place.
+	/// @param[in] hue The hue HSL-component
+	/// @param[in] saturation The saturation HSL-component
+	/// @param[in] luminance The luminance HSL-component
+	/// @param[out] red The red RGB-component
+	/// @param[out] green The green RGB-component
+	/// @param[out] blue The blue RGB-component
 	///
-	void transform(uint8_t & red, uint8_t & green, uint8_t & blue) const;
 
+	static void hsl2rgb(uint16_t hue, float saturation, float luminance, uint8_t & red, uint8_t & green, uint8_t & blue);
 	///
 	///	Translates an RGB (red, green, blue) color to an HSV (hue, saturation, value) color
 	///
@@ -97,10 +65,4 @@ class HsvTransform
 	/// number and scaled between 0 and 360
 	///
 	static void hsv2rgb(uint16_t hue, uint8_t saturation, uint8_t value, uint8_t & red, uint8_t & green, uint8_t & blue);
-
-private:
-	/// The saturation gain
-	double _saturationGain;
-	/// The value gain
-	double _valueGain;
 };