Fixed enable denoise wavelet level - enable denoise chroma

This commit is contained in:
Desmis
2020-10-27 09:55:04 +01:00
parent 445505aa4d
commit 85bd064454
2 changed files with 16 additions and 10 deletions

View File

@@ -2377,6 +2377,7 @@ bool ImProcFunctions::WaveletDenoiseAll_BiShrinkL(wavelet_decomposition& Wavelet
bool ImProcFunctions::WaveletDenoiseAll_BiShrinkAB(wavelet_decomposition& WaveletCoeffs_L, wavelet_decomposition& WaveletCoeffs_ab, float *noisevarchrom, float madL[8][3], float *variC, int local, float noisevar_ab, const bool useNoiseCCurve, bool autoch, bool denoiseMethodRgb, int denoiseNestedLevels)
{
int maxlvl = WaveletCoeffs_L.maxlevel();
printf("Ftblockdn ab bishrink\n");
if (local == 1) {
maxlvl = 6; //for local denoise
@@ -2458,6 +2459,7 @@ bool ImProcFunctions::WaveletDenoiseAll_BiShrinkAB(wavelet_decomposition& Wavele
float* const* WavCoeffs_ab = WaveletCoeffs_ab.level_coeffs(lvl);
if (lvl == maxlvl - 1) {
//printf("Shrink ab bis\n");
ShrinkAllAB(WaveletCoeffs_L, WaveletCoeffs_ab, buffer, lvl, dir, noisevarchrom, noisevar_ab, useNoiseCCurve, autoch, denoiseMethodRgb, madL[lvl], nullptr, 0, madab[lvl], true);
} else {
//simple wavelet shrinkage
@@ -2617,7 +2619,7 @@ bool ImProcFunctions::WaveletDenoiseAllAB(wavelet_decomposition& WaveletCoeffs_L
float *noisevarchrom, float madL[8][3], float *variC, int local, float noisevar_ab, const bool useNoiseCCurve, bool autoch, bool denoiseMethodRgb, int denoiseNestedLevels)//mod JD
{
printf("Ftblockdn ab std\n");
int maxlvl = WaveletCoeffs_L.maxlevel();
if (local == 1) {
@@ -2780,6 +2782,7 @@ void ImProcFunctions::ShrinkAllAB(wavelet_decomposition& WaveletCoeffs_L, wavele
{
//simple wavelet shrinkage
const float eps = 0.01f;
// printf("Shrink ab simple\n");
if (autoch && noisevar_ab <= 0.001f) {
noisevar_ab = 0.02f;