mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
caab8e819b
* 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
115 lines
2.5 KiB
C++
115 lines
2.5 KiB
C++
#include <iostream>
|
|
#include <cmath>
|
|
|
|
#include <utils/RgbTransform.h>
|
|
|
|
RgbTransform::RgbTransform()
|
|
{
|
|
init(1.0, 1.0, 1.0, 0.0, 1.0);
|
|
}
|
|
|
|
RgbTransform::RgbTransform(double gammaR, double gammaG, double gammaB, double brightnessLow, double brightnessHigh)
|
|
{
|
|
init(gammaR, gammaG, gammaB, brightnessLow, brightnessHigh);
|
|
}
|
|
|
|
void RgbTransform::init(double gammaR, double gammaG, double gammaB, double brightnessLow, double brightnessHigh)
|
|
{
|
|
setGamma(gammaR,gammaG,gammaB);
|
|
setBrightnessMin(brightnessLow);
|
|
setBrightness(brightnessHigh);
|
|
initializeMapping();
|
|
}
|
|
|
|
RgbTransform::~RgbTransform()
|
|
{
|
|
}
|
|
|
|
double RgbTransform::getGammaR() const
|
|
{
|
|
return _gammaR;
|
|
}
|
|
|
|
double RgbTransform::getGammaG() const
|
|
{
|
|
return _gammaG;
|
|
}
|
|
|
|
double RgbTransform::getGammaB() const
|
|
{
|
|
return _gammaB;
|
|
}
|
|
|
|
void RgbTransform::setGamma(double gammaR, double gammaG, double gammaB)
|
|
{
|
|
_gammaR = gammaR;
|
|
_gammaG = (gammaG < 0.0) ? _gammaR : gammaG;
|
|
_gammaB = (gammaB < 0.0) ? _gammaR : gammaB;
|
|
initializeMapping();
|
|
}
|
|
|
|
void RgbTransform::initializeMapping()
|
|
{
|
|
for (int i = 0; i < 256; ++i)
|
|
{
|
|
_mappingR[i] = std::min(std::max((int)(std::pow(i / 255.0, _gammaR) * 255), 0), 255);
|
|
_mappingG[i] = std::min(std::max((int)(std::pow(i / 255.0, _gammaG) * 255), 0), 255);
|
|
_mappingB[i] = std::min(std::max((int)(std::pow(i / 255.0, _gammaB) * 255), 0), 255);
|
|
}
|
|
}
|
|
|
|
|
|
double RgbTransform::getBrightnessMin() const
|
|
{
|
|
return _brightnessLow;
|
|
}
|
|
|
|
void RgbTransform::setBrightnessMin(double brightness)
|
|
{
|
|
_brightnessLow = brightness;
|
|
_sumBrightnessLow = 765.0 * ((std::pow(2.0,brightness*2)-1) / 3.0);
|
|
}
|
|
|
|
double RgbTransform::getBrightness() const
|
|
{
|
|
return _brightnessHigh;
|
|
}
|
|
|
|
void RgbTransform::setBrightness(double brightness)
|
|
{
|
|
_brightnessHigh = brightness;
|
|
_sumBrightnessHigh = 765.0 * ((std::pow(2.0,brightness*2)-1) / 3.0);
|
|
}
|
|
|
|
void RgbTransform::transform(uint8_t & red, uint8_t & green, uint8_t & blue)
|
|
{
|
|
// apply gamma
|
|
red = _mappingR[red];
|
|
green = _mappingR[green];
|
|
blue = _mappingR[blue];
|
|
|
|
//std::cout << (int)red << " " << (int)green << " " << (int)blue << " => ";
|
|
// apply brightnesss
|
|
if (red ==0) red = 1;
|
|
if (green==0) green = 1;
|
|
if (blue ==0) blue = 1;
|
|
|
|
int rgbSum = red+green+blue;
|
|
|
|
if (rgbSum > _sumBrightnessHigh)
|
|
{
|
|
double cH = _sumBrightnessHigh / rgbSum;
|
|
red *= cH;
|
|
green *= cH;
|
|
blue *= cH;
|
|
}
|
|
else if (rgbSum < _sumBrightnessLow)
|
|
{
|
|
double cL = _sumBrightnessLow / rgbSum;
|
|
red *= cL;
|
|
green *= cL;
|
|
blue *= cL;
|
|
}
|
|
//std::cout << (int)red << " " << (int)green << " " << (int)blue << std::endl;
|
|
}
|