mirror of https://github.com/SixLabors/ImageSharp
winscripter
4 weeks ago
6 changed files with 776 additions and 133 deletions
@ -0,0 +1,24 @@ |
|||||
|
// Copyright (c) Six Labors.
|
||||
|
// Licensed under the Six Labors Split License.
|
||||
|
|
||||
|
using SixLabors.ImageSharp.Formats.Jxl.Memory; |
||||
|
|
||||
|
namespace SixLabors.ImageSharp.Formats.Jxl.Processing.Butteraugli; |
||||
|
|
||||
|
internal sealed class ButteraugliBlurTemp : IDisposable |
||||
|
{ |
||||
|
public JxlPlane<float> TransposedTemp { get; set; } = new(); |
||||
|
|
||||
|
public JxlPlane<float> GetTransposed(Configuration configuration, JxlPlane<float> input) |
||||
|
{ |
||||
|
if (this.TransposedTemp.XSize == 0) |
||||
|
{ |
||||
|
// Yes, YSize and XSize are swapped
|
||||
|
this.TransposedTemp = JxlPlane<float>.Create(configuration, input.YSize, input.XSize); |
||||
|
} |
||||
|
|
||||
|
return this.TransposedTemp; |
||||
|
} |
||||
|
|
||||
|
public void Dispose() => this.TransposedTemp.Dispose(); |
||||
|
} |
||||
@ -1,46 +1,300 @@ |
|||||
// Copyright (c) Six Labors.
|
// Copyright (c) Six Labors.
|
||||
// Licensed under the Six Labors Split License.
|
// Licensed under the Six Labors Split License.
|
||||
|
|
||||
|
using SixLabors.ImageSharp.Formats.Jxl.Memory; |
||||
using SixLabors.ImageSharp.Formats.Jxl.Memory.ImageTypes; |
using SixLabors.ImageSharp.Formats.Jxl.Memory.ImageTypes; |
||||
|
using SixLabors.ImageSharp.Formats.Jxl.Processing.Image; |
||||
|
|
||||
namespace SixLabors.ImageSharp.Formats.Jxl.Processing.Butteraugli; |
namespace SixLabors.ImageSharp.Formats.Jxl.Processing.Butteraugli; |
||||
|
|
||||
internal sealed class ButteraugliComparator |
internal class ButteraugliComparator : IDisposable |
||||
{ |
{ |
||||
private int xSize; |
private readonly int xSize; |
||||
private int ySize; |
private readonly int ySize; |
||||
private ButteraugliParameters parameters; |
private ButteraugliParameters parameters; |
||||
private readonly ButteraugliPsychoImage pi0; |
private readonly ButteraugliPsychoImage pi0 = new(); |
||||
private readonly JxlImage3F temp; |
private JxlImage3F? temp; |
||||
private bool tempInUse; |
private readonly ButteraugliBlurTemp blurTemp = new(); |
||||
private readonly ButteraugliBlurTemp blurTemp; |
private ButteraugliComparator? sub; |
||||
|
|
||||
|
public ButteraugliComparator(int xsize, int ysize, ButteraugliParameters parameters) |
||||
|
{ |
||||
|
this.xSize = xsize; |
||||
|
this.ySize = ysize; |
||||
|
this.parameters = parameters; |
||||
|
} |
||||
|
|
||||
|
public JxlImage3F Temp => this.temp ??= new(); |
||||
|
|
||||
|
public static ButteraugliComparator Make(Configuration configuration, JxlImage3F rgb0, ButteraugliParameters parameters) |
||||
|
{ |
||||
|
int xSize = rgb0.XSize; |
||||
|
int ySize = rgb0.YSize; |
||||
|
|
||||
|
ButteraugliComparator result = new(xSize, ySize, parameters) |
||||
|
{ |
||||
|
temp = new JxlImage3F(configuration, xSize, ySize) |
||||
|
}; |
||||
|
|
||||
|
if (xSize < 8 || ySize < 8) |
||||
|
{ |
||||
|
return result; |
||||
|
} |
||||
|
|
||||
|
JxlImage3F xyb0 = new(configuration, xSize, ySize); |
||||
|
|
||||
|
if (!Butteraugli.OpsinDynamicsImage(configuration, rgb0, parameters, result.Temp, result.blurTemp, xyb0)) |
||||
|
{ |
||||
|
throw new InvalidOperationException("OpsinDynamicsImage failed"); |
||||
|
} |
||||
|
|
||||
|
result.ReleaseTemp(); |
||||
|
|
||||
|
if (!Butteraugli.SeparateFrequencies(configuration, result.blurTemp, xyb0, result.pi0)) |
||||
|
{ |
||||
|
throw new InvalidOperationException("Could not separate frequencies"); |
||||
|
} |
||||
|
|
||||
|
JxlImage3F subsampledRgb0 = Butteraugli.SubSample2x(configuration, rgb0); |
||||
|
result.sub = Make(configuration, subsampledRgb0, parameters); |
||||
|
|
||||
|
return result; |
||||
|
} |
||||
|
|
||||
|
public void ReleaseTemp() |
||||
|
{ |
||||
|
this.temp?.Dispose(); |
||||
|
this.temp = null; |
||||
|
} |
||||
|
|
||||
/// <summary>
|
/// <summary>
|
||||
/// Computes the butteraugli map between the original image given in the constructor and the distorted image given here.
|
/// Computes the butteraugli map between the original image given in the constructor and the distorted image given here.
|
||||
/// </summary>
|
/// </summary>
|
||||
public bool Diffmap(JxlImage3F rgb1, JxlImageF result) |
public virtual bool Diffmap(Configuration configuration, JxlImage3F rgb1, JxlImageF result) |
||||
{ |
{ |
||||
throw new NotImplementedException(); |
if (this.xSize < 8 || this.ySize < 8) |
||||
|
{ |
||||
|
result.Clear(); |
||||
|
return true; |
||||
|
} |
||||
|
|
||||
|
JxlImage3F xyb1 = new(configuration, this.xSize, this.ySize); |
||||
|
|
||||
|
if (!Butteraugli.OpsinDynamicsImage(configuration, rgb1, this.parameters, this.Temp, this.blurTemp, xyb1)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
this.ReleaseTemp(); |
||||
|
|
||||
|
if (!this.DiffmapOpsinDynamicsImage(configuration, xyb1, out result)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
if (this.sub is not null) |
||||
|
{ |
||||
|
if (this.sub.xSize < 8 || this.sub.ySize < 8) |
||||
|
{ |
||||
|
return true; |
||||
|
} |
||||
|
|
||||
|
JxlImage3F subXyb = new(configuration, this.sub.xSize, this.sub.ySize); |
||||
|
JxlImage3F subsampledRgb1 = Butteraugli.SubSample2x(configuration, rgb1); |
||||
|
|
||||
|
if (!Butteraugli.OpsinDynamicsImage(configuration, subsampledRgb1, this.parameters, this.sub.Temp, this.sub.blurTemp, subXyb)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
this.sub.ReleaseTemp(); |
||||
|
|
||||
|
if (!this.DiffmapOpsinDynamicsImage(configuration, subXyb, out JxlImageF subResult)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
Butteraugli.AddSupersampled2x(subResult, 0.5f, result); |
||||
|
} |
||||
|
|
||||
|
return true; |
||||
} |
} |
||||
|
|
||||
/// <summary>
|
/// <summary>
|
||||
/// Same as Diffmap but OpsinDynamicsImage() was already applied.
|
/// Same as Diffmap but OpsinDynamicsImage() was already applied.
|
||||
/// </summary>
|
/// </summary>
|
||||
public bool DiffmapOpsinDynamicsImage(JxlImage3F xyb1, JxlImageF result) |
public bool DiffmapOpsinDynamicsImage(Configuration configuration, JxlImage3F xyb1, out JxlImageF result) |
||||
{ |
{ |
||||
throw new NotImplementedException(); |
result = new(); |
||||
|
|
||||
|
if (this.xSize < 8 || this.ySize < 8) |
||||
|
{ |
||||
|
result.Clear(); |
||||
|
return true; |
||||
|
} |
||||
|
|
||||
|
ButteraugliPsychoImage pi1 = new(); |
||||
|
|
||||
|
if (!Butteraugli.SeparateFrequencies(configuration, this.blurTemp, xyb1, pi1)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
result = new(configuration, this.xSize, this.ySize); |
||||
|
return this.DiffmapPsychoImage(configuration, pi1, result); |
||||
} |
} |
||||
|
|
||||
/// <summary>
|
/// <summary>
|
||||
/// Same as above but the frequency decomposition was already applied.
|
/// Same as above but the frequency decomposition was already applied.
|
||||
/// </summary>
|
/// </summary>
|
||||
public bool DiffmapPsychoImage(ButteraugliPsychoImage pi1, JxlImageF diffmap) |
public bool DiffmapPsychoImage(Configuration configuration, ButteraugliPsychoImage pi1, JxlImageF diffmap) |
||||
{ |
{ |
||||
throw new NotImplementedException(); |
if (this.xSize < 8 || this.ySize < 8) |
||||
|
{ |
||||
|
diffmap.Clear(); |
||||
|
return true; |
||||
|
} |
||||
|
|
||||
|
float hfAsymmetry = this.parameters.HfAsymmetry; |
||||
|
float xmul = this.parameters.XMultiplier; |
||||
|
|
||||
|
JxlImageF diffs = new(configuration, this.xSize, this.ySize); |
||||
|
JxlImage3<float> blockDiffAc = new(configuration, this.xSize, this.ySize); |
||||
|
|
||||
|
JxlImageOperations.ZeroFillImage(blockDiffAc); |
||||
|
|
||||
|
if (!Butteraugli.MaltaDiffMap( |
||||
|
this.pi0.Uhf[1], |
||||
|
pi1.Uhf[1], |
||||
|
Butteraugli.WUhfMalta * hfAsymmetry, |
||||
|
Butteraugli.WUhfMalta / hfAsymmetry, |
||||
|
Butteraugli.Norm1Uhf, |
||||
|
diffs, |
||||
|
blockDiffAc, |
||||
|
1)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
if (!Butteraugli.MaltaDiffMap( |
||||
|
this.pi0.Uhf[0], |
||||
|
pi1.Uhf[0], |
||||
|
Butteraugli.WUhfMaltaX * hfAsymmetry, |
||||
|
Butteraugli.WUhfMaltaX / hfAsymmetry, |
||||
|
Butteraugli.Norm1UhfX, |
||||
|
diffs, |
||||
|
blockDiffAc, |
||||
|
0)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
if (!Butteraugli.MaltaDiffMapLf( |
||||
|
this.pi0.Hf[1], |
||||
|
pi1.Hf[1], |
||||
|
Butteraugli.WHfMalta * MathF.Sqrt(hfAsymmetry), |
||||
|
Butteraugli.WHfMalta / MathF.Sqrt(hfAsymmetry), |
||||
|
Butteraugli.Norm1Hf, |
||||
|
diffs, |
||||
|
blockDiffAc, |
||||
|
1)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
if (!Butteraugli.MaltaDiffMapLf( |
||||
|
this.pi0.Hf[0], |
||||
|
pi1.Hf[0], |
||||
|
Butteraugli.WHfMaltaX * MathF.Sqrt(hfAsymmetry), |
||||
|
Butteraugli.WHfMaltaX / MathF.Sqrt(hfAsymmetry), |
||||
|
Butteraugli.Norm1HfX, |
||||
|
diffs, |
||||
|
blockDiffAc, |
||||
|
0)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
if (!Butteraugli.MaltaDiffMapLf( |
||||
|
this.pi0.Mf!.Plane(1), |
||||
|
pi1.Mf!.Plane(1), |
||||
|
Butteraugli.WHfMalta, |
||||
|
Butteraugli.WMfMalta, |
||||
|
Butteraugli.Norm1Mf, |
||||
|
diffs, |
||||
|
blockDiffAc, |
||||
|
1)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
if (!Butteraugli.MaltaDiffMapLf( |
||||
|
this.pi0.Mf!.Plane(0), |
||||
|
pi1.Mf!.Plane(0), |
||||
|
Butteraugli.WHfMaltaX, |
||||
|
Butteraugli.WMfMaltaX, |
||||
|
Butteraugli.Norm1MfX, |
||||
|
diffs, |
||||
|
blockDiffAc, |
||||
|
0)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
JxlImage3F blockDiffDc = new(configuration, this.xSize, this.ySize); |
||||
|
|
||||
|
for (int c = 0; c < 3; c++) |
||||
|
{ |
||||
|
if (c < 2) |
||||
|
{ |
||||
|
Butteraugli.L2DiffAsymmetric( |
||||
|
this.pi0.Hf[c], |
||||
|
pi1.Hf[c], |
||||
|
Butteraugli.Wmul[c] * hfAsymmetry, |
||||
|
Butteraugli.Wmul[c] / hfAsymmetry, |
||||
|
blockDiffAc.Plane(c)); |
||||
|
} |
||||
|
|
||||
|
Butteraugli.L2Diff( |
||||
|
this.pi0.Mf.Plane(c), |
||||
|
pi1.Mf.Plane(c), |
||||
|
Butteraugli.Wmul[3 + c], |
||||
|
blockDiffAc.Plane(c)); |
||||
|
|
||||
|
Butteraugli.SetL2Diff( |
||||
|
this.pi0.Lf!.Plane(c), |
||||
|
pi1.Lf!.Plane(c), |
||||
|
Butteraugli.Wmul[6 + c], |
||||
|
blockDiffDc.Plane(c)); |
||||
|
} |
||||
|
|
||||
|
JxlImageF mask = new(); |
||||
|
|
||||
|
if (!Butteraugli.MaskButteraugliPsychoImage( |
||||
|
configuration, |
||||
|
this.pi0, |
||||
|
pi1, |
||||
|
this.xSize, |
||||
|
this.ySize, |
||||
|
this.blurTemp, |
||||
|
mask, |
||||
|
out JxlImageF? diffAc)) |
||||
|
{ |
||||
|
return false; |
||||
|
} |
||||
|
|
||||
|
diffAc?.BytesSpan.CopyTo(blockDiffAc.Plane(1).BytesSpan); |
||||
|
|
||||
|
return Butteraugli.CombineChannelsToDiffmap(mask, blockDiffDc, blockDiffAc, xmul, diffmap); |
||||
} |
} |
||||
|
|
||||
public bool Mask(JxlImageF mask) |
public virtual bool Mask(Configuration configuration, JxlImageF mask) |
||||
|
=> Butteraugli.MaskButteraugliPsychoImage(configuration, this.pi0, this.pi0, this.xSize, this.ySize, this.blurTemp, mask, out _); |
||||
|
|
||||
|
public void Dispose() |
||||
{ |
{ |
||||
throw new NotImplementedException(); |
this.temp?.Dispose(); |
||||
|
this.temp = null; |
||||
|
this.blurTemp.Dispose(); |
||||
} |
} |
||||
} |
} |
||||
|
|||||
@ -0,0 +1,23 @@ |
|||||
|
// Copyright (c) Six Labors.
|
||||
|
// Licensed under the Six Labors Split License.
|
||||
|
|
||||
|
using System.Runtime.CompilerServices; |
||||
|
using SixLabors.ImageSharp.Formats.Jxl.Memory; |
||||
|
using SixLabors.ImageSharp.Formats.Jxl.Memory.ImageTypes; |
||||
|
|
||||
|
namespace SixLabors.ImageSharp.Formats.Jxl.Processing.Butteraugli; |
||||
|
|
||||
|
// Public fields because InlineArray2 values
|
||||
|
// cannot be mutated if it's a property
|
||||
|
#pragma warning disable SA1401 // Fields should be private
|
||||
|
|
||||
|
internal sealed class ButteraugliPsychoImage |
||||
|
{ |
||||
|
public InlineArray2<JxlPlane<float>> Uhf; // XY
|
||||
|
|
||||
|
public InlineArray2<JxlPlane<float>> Hf; // XY
|
||||
|
|
||||
|
public JxlImage3F? Mf { get; set; } // XYB
|
||||
|
|
||||
|
public JxlImage3F? Lf { get; set; } // XYB
|
||||
|
} |
||||
Loading…
Reference in new issue