diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.CmykVector512.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.CmykVector512.cs
index f5c479db2..6daf4f8b8 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.CmykVector512.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.CmykVector512.cs
@@ -48,6 +48,17 @@ internal abstract partial class JpegColorConverterBase
///
protected override void ConvertFromRgbVectorized(in ComponentValues values, Span rLane, Span gLane, Span bLane)
+ => ConvertFromRgbVectorized(in values, this.MaximumValue, rLane, gLane, bLane);
+
+ ///
+ protected override void ConvertToRgbInPlaceScalarRemainder(in ComponentValues values)
+ => CmykScalar.ConvertToRgbInplace(values, this.MaximumValue);
+
+ ///
+ protected override void ConvertFromRgbScalarRemainder(in ComponentValues values, Span rLane, Span gLane, Span bLane)
+ => CmykScalar.ConvertFromRgb(values, this.MaximumValue, rLane, gLane, bLane);
+
+ internal static void ConvertFromRgbVectorized(in ComponentValues values, float maxValue, Span rLane, Span gLane, Span bLane)
{
ref Vector512 destC =
ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component0));
@@ -65,7 +76,7 @@ internal abstract partial class JpegColorConverterBase
ref Vector512 srcB =
ref Unsafe.As>(ref MemoryMarshal.GetReference(bLane));
- Vector512 scale = Vector512.Create(this.MaximumValue);
+ Vector512 scale = Vector512.Create(maxValue);
nuint n = values.Component0.Vector512Count();
for (nuint i = 0; i < n; i++)
@@ -86,13 +97,5 @@ internal abstract partial class JpegColorConverterBase
Unsafe.Add(ref destK, i) = scale - ktmp;
}
}
-
- ///
- protected override void ConvertToRgbInPlaceScalarRemainder(in ComponentValues values)
- => CmykScalar.ConvertToRgbInplace(values, this.MaximumValue);
-
- ///
- protected override void ConvertFromRgbScalarRemainder(in ComponentValues values, Span rLane, Span gLane, Span bLane)
- => CmykScalar.ConvertFromRgb(values, this.MaximumValue, rLane, gLane, bLane);
}
}
diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.GrayScaleVector256.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.GrayScaleVector256.cs
index 12ced3dcd..139ffc549 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.GrayScaleVector256.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.GrayScaleVector256.cs
@@ -4,7 +4,7 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Intrinsics;
-using SixLabors.ImageSharp.Common.Helpers;
+using Vector256_ = SixLabors.ImageSharp.Common.Helpers.Vector256Utilities;
namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
@@ -60,7 +60,7 @@ internal abstract partial class JpegColorConverterBase
ref Vector256 b = ref Unsafe.Add(ref srcBlue, i);
// luminosity = (0.299 * r) + (0.587 * g) + (0.114 * b)
- Unsafe.Add(ref destLuminance, i) = Vector256Utilities.MultiplyAdd(Vector256Utilities.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
+ Unsafe.Add(ref destLuminance, i) = Vector256_.MultiplyAdd(Vector256_.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
}
}
}
diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.GrayScaleVector512.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.GrayScaleVector512.cs
index 163cb6656..21d5eaa6f 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.GrayScaleVector512.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.GrayScaleVector512.cs
@@ -4,7 +4,7 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Intrinsics;
-using SixLabors.ImageSharp.Common.Helpers;
+using Vector512_ = SixLabors.ImageSharp.Common.Helpers.Vector512Utilities;
namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
@@ -60,7 +60,7 @@ internal abstract partial class JpegColorConverterBase
ref Vector512 b = ref Unsafe.Add(ref srcBlue, i);
// luminosity = (0.299 * r) + (0.587 * g) + (0.114 * b)
- Unsafe.Add(ref destLuminance, i) = Vector512Utilities.MultiplyAdd(Vector512Utilities.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
+ Unsafe.Add(ref destLuminance, i) = Vector512_.MultiplyAdd(Vector512_.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
}
}
@@ -69,7 +69,7 @@ internal abstract partial class JpegColorConverterBase
=> GrayScaleScalar.ConvertToRgbInPlace(values.Component0, this.MaximumValue);
///
- protected override void ConvertFromRgbScalarRemainder(in ComponentValues values, Span r, Span g, Span b)
- => GrayScaleScalar.ConvertFromRgbScalar(values, r, g, b);
+ protected override void ConvertFromRgbScalarRemainder(in ComponentValues values, Span rLane, Span gLane, Span bLane)
+ => GrayScaleScalar.ConvertFromRgbScalar(values, rLane, gLane, bLane);
}
}
diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector128.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector128.cs
index 95e3167cc..8cecd3956 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector128.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector128.cs
@@ -4,7 +4,7 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Intrinsics;
-using SixLabors.ImageSharp.Common.Helpers;
+using Vector128_ = SixLabors.ImageSharp.Common.Helpers.Vector128Utilities;
namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
@@ -52,13 +52,13 @@ internal abstract partial class JpegColorConverterBase
// r = y + (1.402F * cr);
// g = y - (0.344136F * cb) - (0.714136F * cr);
// b = y + (1.772F * cb);
- Vector128 r = Vector128Utilities.MultiplyAdd(y, cr, rCrMult);
- Vector128 g = Vector128Utilities.MultiplyAdd(Vector128Utilities.MultiplyAdd(y, cb, gCbMult), cr, gCrMult);
- Vector128 b = Vector128Utilities.MultiplyAdd(y, cb, bCbMult);
+ Vector128 r = Vector128_.MultiplyAdd(y, cr, rCrMult);
+ Vector128 g = Vector128_.MultiplyAdd(Vector128_.MultiplyAdd(y, cb, gCbMult), cr, gCrMult);
+ Vector128 b = Vector128_.MultiplyAdd(y, cb, bCbMult);
- r = Vector128Utilities.RoundToNearestInteger(r) * scale;
- g = Vector128Utilities.RoundToNearestInteger(g) * scale;
- b = Vector128Utilities.RoundToNearestInteger(b) * scale;
+ r = Vector128_.RoundToNearestInteger(r) * scale;
+ g = Vector128_.RoundToNearestInteger(g) * scale;
+ b = Vector128_.RoundToNearestInteger(b) * scale;
c0 = r;
c1 = g;
@@ -103,9 +103,9 @@ internal abstract partial class JpegColorConverterBase
// y = 0 + (0.299 * r) + (0.587 * g) + (0.114 * b)
// cb = 128 - (0.168736 * r) - (0.331264 * g) + (0.5 * b)
// cr = 128 + (0.5 * r) - (0.418688 * g) - (0.081312 * b)
- Vector128 y = Vector128Utilities.MultiplyAdd(Vector128Utilities.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
- Vector128 cb = chromaOffset + Vector128Utilities.MultiplyAdd(Vector128Utilities.MultiplyAdd(f05 * b, fn0331264, g), fn0168736, r);
- Vector128 cr = chromaOffset + Vector128Utilities.MultiplyAdd(Vector128Utilities.MultiplyAdd(fn0081312F * b, fn0418688, g), f05, r);
+ Vector128 y = Vector128_.MultiplyAdd(Vector128_.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
+ Vector128 cb = chromaOffset + Vector128_.MultiplyAdd(Vector128_.MultiplyAdd(f05 * b, fn0331264, g), fn0168736, r);
+ Vector128 cr = chromaOffset + Vector128_.MultiplyAdd(Vector128_.MultiplyAdd(fn0081312F * b, fn0418688, g), f05, r);
Unsafe.Add(ref destY, i) = y;
Unsafe.Add(ref destCb, i) = cb;
diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector256.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector256.cs
index 8d8e23468..f8517e086 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector256.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector256.cs
@@ -4,7 +4,7 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Intrinsics;
-using SixLabors.ImageSharp.Common.Helpers;
+using Vector256_ = SixLabors.ImageSharp.Common.Helpers.Vector256Utilities;
namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
@@ -52,13 +52,13 @@ internal abstract partial class JpegColorConverterBase
// r = y + (1.402F * cr);
// g = y - (0.344136F * cb) - (0.714136F * cr);
// b = y + (1.772F * cb);
- Vector256 r = Vector256Utilities.MultiplyAdd(y, cr, rCrMult);
- Vector256 g = Vector256Utilities.MultiplyAdd(Vector256Utilities.MultiplyAdd(y, cb, gCbMult), cr, gCrMult);
- Vector256 b = Vector256Utilities.MultiplyAdd(y, cb, bCbMult);
+ Vector256 r = Vector256_.MultiplyAdd(y, cr, rCrMult);
+ Vector256 g = Vector256_.MultiplyAdd(Vector256_.MultiplyAdd(y, cb, gCbMult), cr, gCrMult);
+ Vector256 b = Vector256_.MultiplyAdd(y, cb, bCbMult);
- r = Vector256Utilities.RoundToNearestInteger(r) * scale;
- g = Vector256Utilities.RoundToNearestInteger(g) * scale;
- b = Vector256Utilities.RoundToNearestInteger(b) * scale;
+ r = Vector256_.RoundToNearestInteger(r) * scale;
+ g = Vector256_.RoundToNearestInteger(g) * scale;
+ b = Vector256_.RoundToNearestInteger(b) * scale;
c0 = r;
c1 = g;
@@ -103,9 +103,9 @@ internal abstract partial class JpegColorConverterBase
// y = 0 + (0.299 * r) + (0.587 * g) + (0.114 * b)
// cb = 128 - (0.168736 * r) - (0.331264 * g) + (0.5 * b)
// cr = 128 + (0.5 * r) - (0.418688 * g) - (0.081312 * b)
- Vector256 y = Vector256Utilities.MultiplyAdd(Vector256Utilities.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
- Vector256 cb = chromaOffset + Vector256Utilities.MultiplyAdd(Vector256Utilities.MultiplyAdd(f05 * b, fn0331264, g), fn0168736, r);
- Vector256 cr = chromaOffset + Vector256Utilities.MultiplyAdd(Vector256Utilities.MultiplyAdd(fn0081312F * b, fn0418688, g), f05, r);
+ Vector256 y = Vector256_.MultiplyAdd(Vector256_.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
+ Vector256 cb = chromaOffset + Vector256_.MultiplyAdd(Vector256_.MultiplyAdd(f05 * b, fn0331264, g), fn0168736, r);
+ Vector256 cr = chromaOffset + Vector256_.MultiplyAdd(Vector256_.MultiplyAdd(fn0081312F * b, fn0418688, g), f05, r);
Unsafe.Add(ref destY, i) = y;
Unsafe.Add(ref destCb, i) = cb;
diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector512.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector512.cs
index def65b4a7..7598a64b2 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector512.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YCbCrVector512.cs
@@ -4,7 +4,7 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Intrinsics;
-using SixLabors.ImageSharp.Common.Helpers;
+using Vector512_ = SixLabors.ImageSharp.Common.Helpers.Vector512Utilities;
namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
@@ -51,13 +51,13 @@ internal abstract partial class JpegColorConverterBase
// r = y + (1.402F * cr);
// g = y - (0.344136F * cb) - (0.714136F * cr);
// b = y + (1.772F * cb);
- Vector512 r = Vector512Utilities.MultiplyAdd(y, cr, rCrMult);
- Vector512 g = Vector512Utilities.MultiplyAdd(Vector512Utilities.MultiplyAdd(y, cb, gCbMult), cr, gCrMult);
- Vector512 b = Vector512Utilities.MultiplyAdd(y, cb, bCbMult);
+ Vector512 r = Vector512_.MultiplyAdd(y, cr, rCrMult);
+ Vector512 g = Vector512_.MultiplyAdd(Vector512_.MultiplyAdd(y, cb, gCbMult), cr, gCrMult);
+ Vector512 b = Vector512_.MultiplyAdd(y, cb, bCbMult);
- r = Vector512Utilities.RoundToNearestInteger(r) * scale;
- g = Vector512Utilities.RoundToNearestInteger(g) * scale;
- b = Vector512Utilities.RoundToNearestInteger(b) * scale;
+ r = Vector512_.RoundToNearestInteger(r) * scale;
+ g = Vector512_.RoundToNearestInteger(g) * scale;
+ b = Vector512_.RoundToNearestInteger(b) * scale;
c0 = r;
c1 = g;
@@ -102,9 +102,9 @@ internal abstract partial class JpegColorConverterBase
// y = 0 + (0.299 * r) + (0.587 * g) + (0.114 * b)
// cb = 128 - (0.168736 * r) - (0.331264 * g) + (0.5 * b)
// cr = 128 + (0.5 * r) - (0.418688 * g) - (0.081312 * b)
- Vector512 y = Vector512Utilities.MultiplyAdd(Vector512Utilities.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
- Vector512 cb = chromaOffset + Vector512Utilities.MultiplyAdd(Vector512Utilities.MultiplyAdd(f05 * b, fn0331264, g), fn0168736, r);
- Vector512 cr = chromaOffset + Vector512Utilities.MultiplyAdd(Vector512Utilities.MultiplyAdd(fn0081312F * b, fn0418688, g), f05, r);
+ Vector512 y = Vector512_.MultiplyAdd(Vector512_.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
+ Vector512 cb = chromaOffset + Vector512_.MultiplyAdd(Vector512_.MultiplyAdd(f05 * b, fn0331264, g), fn0168736, r);
+ Vector512 cr = chromaOffset + Vector512_.MultiplyAdd(Vector512_.MultiplyAdd(fn0081312F * b, fn0418688, g), f05, r);
Unsafe.Add(ref destY, i) = y;
Unsafe.Add(ref destCb, i) = cb;
diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKScalar.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKScalar.cs
index 610c0a84e..bb545ec76 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKScalar.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKScalar.cs
@@ -20,13 +20,13 @@ internal abstract partial class JpegColorConverterBase
///
public override void ConvertToRgbInPlace(in ComponentValues values)
- => ConvertToRgpInplace(values, this.MaximumValue, this.HalfValue);
+ => ConvertToRgpInPlace(values, this.MaximumValue, this.HalfValue);
///
- public override void ConvertFromRgb(in ComponentValues values, Span r, Span g, Span b)
- => ConvertFromRgb(values, this.HalfValue, this.MaximumValue, r, g, b);
+ public override void ConvertFromRgb(in ComponentValues values, Span rLane, Span gLane, Span bLane)
+ => ConvertFromRgb(values, this.HalfValue, this.MaximumValue, rLane, gLane, bLane);
- public static void ConvertToRgpInplace(in ComponentValues values, float maxValue, float halfValue)
+ public static void ConvertToRgpInPlace(in ComponentValues values, float maxValue, float halfValue)
{
Span c0 = values.Component0;
Span c1 = values.Component1;
diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector.cs
index 5d57d0e54..af144240e 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector.cs
@@ -71,7 +71,7 @@ internal abstract partial class JpegColorConverterBase
///
protected override void ConvertToRgbInPlaceScalarRemainder(in ComponentValues values)
- => YccKScalar.ConvertToRgpInplace(values, this.MaximumValue, this.HalfValue);
+ => YccKScalar.ConvertToRgpInPlace(values, this.MaximumValue, this.HalfValue);
///
protected override void ConvertFromRgbVectorized(in ComponentValues values, Span rLane, Span gLane, Span bLane)
diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector128.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector128.cs
new file mode 100644
index 000000000..5bb2c5e5b
--- /dev/null
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector128.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Runtime.Intrinsics;
+using Vector128_ = SixLabors.ImageSharp.Common.Helpers.Vector128Utilities;
+
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
+
+internal abstract partial class JpegColorConverterBase
+{
+ internal sealed class YccKVector128 : JpegColorConverterVector128
+ {
+ public YccKVector128(int precision)
+ : base(JpegColorSpace.Ycck, precision)
+ {
+ }
+
+ ///
+ public override void ConvertToRgbInPlace(in ComponentValues values)
+ {
+ ref Vector128 c0Base =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component0));
+ ref Vector128 c1Base =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component1));
+ ref Vector128 c2Base =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component2));
+ ref Vector128 kBase =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component3));
+
+ // Used for the color conversion
+ Vector128 chromaOffset = Vector128.Create(-this.HalfValue);
+ Vector128 scale = Vector128.Create(1 / (this.MaximumValue * this.MaximumValue));
+ Vector128 max = Vector128.Create(this.MaximumValue);
+ Vector128 rCrMult = Vector128.Create(YCbCrScalar.RCrMult);
+ Vector128 gCbMult = Vector128.Create(-YCbCrScalar.GCbMult);
+ Vector128 gCrMult = Vector128.Create(-YCbCrScalar.GCrMult);
+ Vector128 bCbMult = Vector128.Create(YCbCrScalar.BCbMult);
+
+ // Walking 8 elements at one step:
+ nuint n = values.Component0.Vector128Count();
+ for (nuint i = 0; i < n; i++)
+ {
+ // y = yVals[i];
+ // cb = cbVals[i] - 128F;
+ // cr = crVals[i] - 128F;
+ // k = kVals[i] / 256F;
+ ref Vector128 c0 = ref Unsafe.Add(ref c0Base, i);
+ ref Vector128 c1 = ref Unsafe.Add(ref c1Base, i);
+ ref Vector128 c2 = ref Unsafe.Add(ref c2Base, i);
+ Vector128 y = c0;
+ Vector128 cb = c1 + chromaOffset;
+ Vector128 cr = c2 + chromaOffset;
+ Vector128 scaledK = Unsafe.Add(ref kBase, i) * scale;
+
+ // r = y + (1.402F * cr);
+ // g = y - (0.344136F * cb) - (0.714136F * cr);
+ // b = y + (1.772F * cb);
+ Vector128 r = Vector128_.MultiplyAdd(y, cr, rCrMult);
+ Vector128 g = Vector128_.MultiplyAdd(Vector128_.MultiplyAdd(y, cb, gCbMult), cr, gCrMult);
+ Vector128 b = Vector128_.MultiplyAdd(y, cb, bCbMult);
+
+ r = max - Vector128_.RoundToNearestInteger(r);
+ g = max - Vector128_.RoundToNearestInteger(g);
+ b = max - Vector128_.RoundToNearestInteger(b);
+
+ r *= scaledK;
+ g *= scaledK;
+ b *= scaledK;
+
+ c0 = r;
+ c1 = g;
+ c2 = b;
+ }
+ }
+
+ ///
+ public override void ConvertFromRgb(in ComponentValues values, Span rLane, Span gLane, Span bLane)
+ {
+ // rgb -> cmyk
+ CmykVector128.ConvertFromRgb(in values, this.MaximumValue, rLane, gLane, bLane);
+
+ // cmyk -> ycck
+ ref Vector128 destY =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component0));
+ ref Vector128 destCb =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component1));
+ ref Vector128 destCr =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component2));
+
+ ref Vector128 srcR = ref destY;
+ ref Vector128 srcG = ref destCb;
+ ref Vector128 srcB = ref destCr;
+
+ // Used for the color conversion
+ Vector128 maxSampleValue = Vector128.Create(this.MaximumValue);
+
+ Vector128 chromaOffset = Vector128.Create(this.HalfValue);
+
+ Vector128 f0299 = Vector128.Create(0.299f);
+ Vector128 f0587 = Vector128.Create(0.587f);
+ Vector128 f0114 = Vector128.Create(0.114f);
+ Vector128 fn0168736 = Vector128.Create(-0.168736f);
+ Vector128 fn0331264 = Vector128.Create(-0.331264f);
+ Vector128 fn0418688 = Vector128.Create(-0.418688f);
+ Vector128 fn0081312F = Vector128.Create(-0.081312F);
+ Vector128 f05 = Vector128.Create(0.5f);
+
+ nuint n = values.Component0.Vector128Count();
+ for (nuint i = 0; i < n; i++)
+ {
+ Vector128 r = maxSampleValue - Unsafe.Add(ref srcR, i);
+ Vector128 g = maxSampleValue - Unsafe.Add(ref srcG, i);
+ Vector128 b = maxSampleValue - Unsafe.Add(ref srcB, i);
+
+ // y = 0 + (0.299 * r) + (0.587 * g) + (0.114 * b)
+ // cb = 128 - (0.168736 * r) - (0.331264 * g) + (0.5 * b)
+ // cr = 128 + (0.5 * r) - (0.418688 * g) - (0.081312 * b)
+ Vector128 y = Vector128_.MultiplyAdd(Vector128_.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
+ Vector128 cb = chromaOffset + Vector128_.MultiplyAdd(Vector128_.MultiplyAdd(f05 * b, fn0331264, g), fn0168736, r);
+ Vector128 cr = chromaOffset + Vector128_.MultiplyAdd(Vector128_.MultiplyAdd(fn0081312F * b, fn0418688, g), f05, r);
+
+ Unsafe.Add(ref destY, i) = y;
+ Unsafe.Add(ref destCb, i) = cb;
+ Unsafe.Add(ref destCr, i) = cr;
+ }
+ }
+ }
+}
diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector256.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector256.cs
new file mode 100644
index 000000000..27f2ce035
--- /dev/null
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector256.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Runtime.Intrinsics;
+using Vector256_ = SixLabors.ImageSharp.Common.Helpers.Vector256Utilities;
+
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
+
+internal abstract partial class JpegColorConverterBase
+{
+ internal sealed class YccKVector256 : JpegColorConverterVector256
+ {
+ public YccKVector256(int precision)
+ : base(JpegColorSpace.Ycck, precision)
+ {
+ }
+
+ ///
+ public override void ConvertToRgbInPlace(in ComponentValues values)
+ {
+ ref Vector256 c0Base =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component0));
+ ref Vector256 c1Base =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component1));
+ ref Vector256 c2Base =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component2));
+ ref Vector256 kBase =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component3));
+
+ // Used for the color conversion
+ Vector256 chromaOffset = Vector256.Create(-this.HalfValue);
+ Vector256 scale = Vector256.Create(1 / (this.MaximumValue * this.MaximumValue));
+ Vector256 max = Vector256.Create(this.MaximumValue);
+ Vector256 rCrMult = Vector256.Create(YCbCrScalar.RCrMult);
+ Vector256 gCbMult = Vector256.Create(-YCbCrScalar.GCbMult);
+ Vector256 gCrMult = Vector256.Create(-YCbCrScalar.GCrMult);
+ Vector256 bCbMult = Vector256.Create(YCbCrScalar.BCbMult);
+
+ // Walking 8 elements at one step:
+ nuint n = values.Component0.Vector256Count();
+ for (nuint i = 0; i < n; i++)
+ {
+ // y = yVals[i];
+ // cb = cbVals[i] - 128F;
+ // cr = crVals[i] - 128F;
+ // k = kVals[i] / 256F;
+ ref Vector256 c0 = ref Unsafe.Add(ref c0Base, i);
+ ref Vector256 c1 = ref Unsafe.Add(ref c1Base, i);
+ ref Vector256 c2 = ref Unsafe.Add(ref c2Base, i);
+ Vector256 y = c0;
+ Vector256 cb = c1 + chromaOffset;
+ Vector256 cr = c2 + chromaOffset;
+ Vector256 scaledK = Unsafe.Add(ref kBase, i) * scale;
+
+ // r = y + (1.402F * cr);
+ // g = y - (0.344136F * cb) - (0.714136F * cr);
+ // b = y + (1.772F * cb);
+ Vector256 r = Vector256_.MultiplyAdd(y, cr, rCrMult);
+ Vector256 g = Vector256_.MultiplyAdd(Vector256_.MultiplyAdd(y, cb, gCbMult), cr, gCrMult);
+ Vector256 b = Vector256_.MultiplyAdd(y, cb, bCbMult);
+
+ r = max - Vector256_.RoundToNearestInteger(r);
+ g = max - Vector256_.RoundToNearestInteger(g);
+ b = max - Vector256_.RoundToNearestInteger(b);
+
+ r *= scaledK;
+ g *= scaledK;
+ b *= scaledK;
+
+ c0 = r;
+ c1 = g;
+ c2 = b;
+ }
+ }
+
+ ///
+ public override void ConvertFromRgb(in ComponentValues values, Span rLane, Span gLane, Span bLane)
+ {
+ // rgb -> cmyk
+ CmykVector256.ConvertFromRgb(in values, this.MaximumValue, rLane, gLane, bLane);
+
+ // cmyk -> ycck
+ ref Vector256 destY =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component0));
+ ref Vector256 destCb =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component1));
+ ref Vector256 destCr =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component2));
+
+ ref Vector256 srcR = ref destY;
+ ref Vector256 srcG = ref destCb;
+ ref Vector256 srcB = ref destCr;
+
+ // Used for the color conversion
+ Vector256 maxSampleValue = Vector256.Create(this.MaximumValue);
+
+ Vector256 chromaOffset = Vector256.Create(this.HalfValue);
+
+ Vector256 f0299 = Vector256.Create(0.299f);
+ Vector256 f0587 = Vector256.Create(0.587f);
+ Vector256 f0114 = Vector256.Create(0.114f);
+ Vector256 fn0168736 = Vector256.Create(-0.168736f);
+ Vector256 fn0331264 = Vector256.Create(-0.331264f);
+ Vector256 fn0418688 = Vector256.Create(-0.418688f);
+ Vector256 fn0081312F = Vector256.Create(-0.081312F);
+ Vector256 f05 = Vector256.Create(0.5f);
+
+ nuint n = values.Component0.Vector256Count();
+ for (nuint i = 0; i < n; i++)
+ {
+ Vector256 r = maxSampleValue - Unsafe.Add(ref srcR, i);
+ Vector256 g = maxSampleValue - Unsafe.Add(ref srcG, i);
+ Vector256 b = maxSampleValue - Unsafe.Add(ref srcB, i);
+
+ // y = 0 + (0.299 * r) + (0.587 * g) + (0.114 * b)
+ // cb = 128 - (0.168736 * r) - (0.331264 * g) + (0.5 * b)
+ // cr = 128 + (0.5 * r) - (0.418688 * g) - (0.081312 * b)
+ Vector256 y = Vector256_.MultiplyAdd(Vector256_.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
+ Vector256 cb = chromaOffset + Vector256_.MultiplyAdd(Vector256_.MultiplyAdd(f05 * b, fn0331264, g), fn0168736, r);
+ Vector256 cr = chromaOffset + Vector256_.MultiplyAdd(Vector256_.MultiplyAdd(fn0081312F * b, fn0418688, g), f05, r);
+
+ Unsafe.Add(ref destY, i) = y;
+ Unsafe.Add(ref destCb, i) = cb;
+ Unsafe.Add(ref destCr, i) = cr;
+ }
+ }
+ }
+}
diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector512.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector512.cs
new file mode 100644
index 000000000..42d89a231
--- /dev/null
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.YccKVector512.cs
@@ -0,0 +1,144 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Runtime.Intrinsics;
+using Vector512_ = SixLabors.ImageSharp.Common.Helpers.Vector512Utilities;
+
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
+
+internal abstract partial class JpegColorConverterBase
+{
+ internal sealed class YccKVector512 : JpegColorConverterVector512
+ {
+ public YccKVector512(int precision)
+ : base(JpegColorSpace.Ycck, precision)
+ {
+ }
+
+ ///
+ protected override void ConvertToRgbInPlaceVectorized(in ComponentValues values)
+ {
+ ref Vector512 c0Base =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component0));
+ ref Vector512 c1Base =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component1));
+ ref Vector512 c2Base =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component2));
+ ref Vector512 kBase =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component3));
+
+ // Used for the color conversion
+ Vector512 chromaOffset = Vector512.Create(-this.HalfValue);
+ Vector512 scale = Vector512.Create(1 / (this.MaximumValue * this.MaximumValue));
+ Vector512 max = Vector512.Create(this.MaximumValue);
+ Vector512 rCrMult = Vector512.Create(YCbCrScalar.RCrMult);
+ Vector512 gCbMult = Vector512.Create(-YCbCrScalar.GCbMult);
+ Vector512 gCrMult = Vector512.Create(-YCbCrScalar.GCrMult);
+ Vector512 bCbMult = Vector512.Create(YCbCrScalar.BCbMult);
+
+ // Walking 8 elements at one step:
+ nuint n = values.Component0.Vector512Count();
+ for (nuint i = 0; i < n; i++)
+ {
+ // y = yVals[i];
+ // cb = cbVals[i] - 128F;
+ // cr = crVals[i] - 128F;
+ // k = kVals[i] / 256F;
+ ref Vector512 c0 = ref Unsafe.Add(ref c0Base, i);
+ ref Vector512 c1 = ref Unsafe.Add(ref c1Base, i);
+ ref Vector512 c2 = ref Unsafe.Add(ref c2Base, i);
+ Vector512 y = c0;
+ Vector512 cb = c1 + chromaOffset;
+ Vector512 cr = c2 + chromaOffset;
+ Vector512 scaledK = Unsafe.Add(ref kBase, i) * scale;
+
+ // r = y + (1.402F * cr);
+ // g = y - (0.344136F * cb) - (0.714136F * cr);
+ // b = y + (1.772F * cb);
+ Vector512 r = Vector512_.MultiplyAdd(y, cr, rCrMult);
+ Vector512 g = Vector512_.MultiplyAdd(Vector512_.MultiplyAdd(y, cb, gCbMult), cr, gCrMult);
+ Vector512 b = Vector512_.MultiplyAdd(y, cb, bCbMult);
+
+ r = max - Vector512_.RoundToNearestInteger(r);
+ g = max - Vector512_.RoundToNearestInteger(g);
+ b = max - Vector512_.RoundToNearestInteger(b);
+
+ r *= scaledK;
+ g *= scaledK;
+ b *= scaledK;
+
+ c0 = r;
+ c1 = g;
+ c2 = b;
+ }
+ }
+
+ ///
+ protected override void ConvertToRgbInPlaceScalarRemainder(in ComponentValues values)
+ => YccKScalar.ConvertToRgpInPlace(values, this.MaximumValue, this.HalfValue);
+
+ ///
+ protected override void ConvertFromRgbVectorized(in ComponentValues values, Span rLane, Span gLane, Span bLane)
+ {
+ // rgb -> cmyk
+ CmykVector512.ConvertFromRgbVectorized(in values, this.MaximumValue, rLane, gLane, bLane);
+
+ // cmyk -> ycck
+ ref Vector512 destY =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component0));
+ ref Vector512 destCb =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component1));
+ ref Vector512 destCr =
+ ref Unsafe.As>(ref MemoryMarshal.GetReference(values.Component2));
+
+ ref Vector512 srcR = ref destY;
+ ref Vector512 srcG = ref destCb;
+ ref Vector512 srcB = ref destCr;
+
+ // Used for the color conversion
+ Vector512 maxSampleValue = Vector512.Create(this.MaximumValue);
+
+ Vector512 chromaOffset = Vector512.Create(this.HalfValue);
+
+ Vector512 f0299 = Vector512.Create(0.299f);
+ Vector512 f0587 = Vector512.Create(0.587f);
+ Vector512 f0114 = Vector512.Create(0.114f);
+ Vector512 fn0168736 = Vector512.Create(-0.168736f);
+ Vector512 fn0331264 = Vector512.Create(-0.331264f);
+ Vector512 fn0418688 = Vector512.Create(-0.418688f);
+ Vector512 fn0081312F = Vector512.Create(-0.081312F);
+ Vector512 f05 = Vector512.Create(0.5f);
+
+ nuint n = values.Component0.Vector512Count();
+ for (nuint i = 0; i < n; i++)
+ {
+ Vector512 r = maxSampleValue - Unsafe.Add(ref srcR, i);
+ Vector512 g = maxSampleValue - Unsafe.Add(ref srcG, i);
+ Vector512 b = maxSampleValue - Unsafe.Add(ref srcB, i);
+
+ // y = 0 + (0.299 * r) + (0.587 * g) + (0.114 * b)
+ // cb = 128 - (0.168736 * r) - (0.331264 * g) + (0.5 * b)
+ // cr = 128 + (0.5 * r) - (0.418688 * g) - (0.081312 * b)
+ Vector512 y = Vector512_.MultiplyAdd(Vector512_.MultiplyAdd(f0114 * b, f0587, g), f0299, r);
+ Vector512 cb = chromaOffset + Vector512_.MultiplyAdd(Vector512_.MultiplyAdd(f05 * b, fn0331264, g), fn0168736, r);
+ Vector512 cr = chromaOffset + Vector512_.MultiplyAdd(Vector512_.MultiplyAdd(fn0081312F * b, fn0418688, g), f05, r);
+
+ Unsafe.Add(ref destY, i) = y;
+ Unsafe.Add(ref destCb, i) = cb;
+ Unsafe.Add(ref destCr, i) = cr;
+ }
+ }
+
+ ///
+ protected override void ConvertFromRgbScalarRemainder(in ComponentValues values, Span rLane, Span gLane, Span bLane)
+ {
+ // rgb -> cmyk
+ CmykScalar.ConvertFromRgb(in values, this.MaximumValue, rLane, gLane, bLane);
+
+ // cmyk -> ycck
+ YccKScalar.ConvertFromRgb(in values, this.HalfValue, this.MaximumValue, rLane, gLane, bLane);
+ }
+ }
+}
diff --git a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverterBase.cs b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverterBase.cs
index 96eb927d0..0371c4e24 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverterBase.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverterBase.cs
@@ -140,9 +140,19 @@ internal abstract partial class JpegColorConverterBase
/// The precision in bits.
private static JpegColorConverterBase GetYccKConverter(int precision)
{
- if (JpegColorConverterVector.IsSupported)
+ if (JpegColorConverterVector512.IsSupported)
+ {
+ return new YccKVector512(precision);
+ }
+
+ if (JpegColorConverterVector256.IsSupported)
+ {
+ return new YccKVector256(precision);
+ }
+
+ if (JpegColorConverterVector128.IsSupported)
{
- return new YccKVector(precision);
+ return new YccKVector128(precision);
}
return new YccKScalar(precision);
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YccKColorConverter.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YccKColorConverter.cs
index 1a81c2190..b18528e40 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YccKColorConverter.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YccKColorConverter.cs
@@ -17,7 +17,7 @@ public class YccKColorConverter : ColorConversionBenchmark
[Benchmark(Baseline = true)]
public void Scalar()
{
- var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
+ JpegColorConverterBase.ComponentValues values = new(this.Input, 0);
new JpegColorConverterBase.YccKScalar(8).ConvertToRgbInPlace(values);
}
@@ -25,8 +25,32 @@ public class YccKColorConverter : ColorConversionBenchmark
[Benchmark]
public void SimdVector8()
{
- var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
+ JpegColorConverterBase.ComponentValues values = new(this.Input, 0);
new JpegColorConverterBase.YccKVector(8).ConvertToRgbInPlace(values);
}
+
+ [Benchmark]
+ public void SimdVector128()
+ {
+ JpegColorConverterBase.ComponentValues values = new(this.Input, 0);
+
+ new JpegColorConverterBase.YccKVector128(8).ConvertToRgbInPlace(values);
+ }
+
+ [Benchmark]
+ public void SimdVector256()
+ {
+ JpegColorConverterBase.ComponentValues values = new(this.Input, 0);
+
+ new JpegColorConverterBase.YccKVector256(8).ConvertToRgbInPlace(values);
+ }
+
+ [Benchmark]
+ public void SimdVector512()
+ {
+ JpegColorConverterBase.ComponentValues values = new(this.Input, 0);
+
+ new JpegColorConverterBase.YccKVector512(8).ConvertToRgbInPlace(values);
+ }
}
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
index 52b5d3183..5dc55cbe2 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
@@ -213,17 +213,17 @@ public class JpegColorConverterTests
{
// arrange
Type expectedType = typeof(JpegColorConverterBase.YccKScalar);
- if (Avx.IsSupported)
+ if (JpegColorConverterBase.JpegColorConverterVector512.IsSupported)
{
- expectedType = typeof(JpegColorConverterBase.YccKVector);
+ expectedType = typeof(JpegColorConverterBase.YccKVector512);
}
- else if (Sse2.IsSupported)
+ else if (JpegColorConverterBase.JpegColorConverterVector256.IsSupported)
{
- expectedType = typeof(JpegColorConverterBase.YccKVector);
+ expectedType = typeof(JpegColorConverterBase.YccKVector256);
}
- else if (AdvSimd.Arm64.IsSupported)
+ else if (JpegColorConverterBase.JpegColorConverterVector128.IsSupported)
{
- expectedType = typeof(JpegColorConverterBase.YccKVector);
+ expectedType = typeof(JpegColorConverterBase.YccKVector128);
}
// act
@@ -474,29 +474,60 @@ public class JpegColorConverterTests
[Theory]
[MemberData(nameof(Seeds))]
- public void FromYccKVector(int seed)
- {
- JpegColorConverterBase.YccKVector converter = new(8);
+ public void FromYccKVector512(int seed) =>
+ this.TestConversionToRgb(
+ new JpegColorConverterBase.YccKVector512(8),
+ 4,
+ seed,
+ new JpegColorConverterBase.YccKScalar(8));
- if (!converter.IsAvailable)
- {
- this.Output.WriteLine(
- $"Skipping test - {converter.GetType().Name} is not supported on current hardware.");
- return;
- }
+ [Theory]
+ [MemberData(nameof(Seeds))]
+ public void FromYccKVector256(int seed) =>
+ this.TestConversionToRgb(
+ new JpegColorConverterBase.YccKVector256(8),
+ 4,
+ seed,
+ new JpegColorConverterBase.YccKScalar(8));
- FeatureTestRunner.RunWithHwIntrinsicsFeature(
- RunTest,
+ [Theory]
+ [MemberData(nameof(Seeds))]
+ public void FromYccKVector128(int seed) =>
+ this.TestConversionToRgb(
+ new JpegColorConverterBase.YccKVector128(8),
+ 4,
seed,
- IntrinsicsConfig);
+ new JpegColorConverterBase.YccKScalar(8));
- static void RunTest(string arg) =>
- ValidateConversionToRgb(
- new JpegColorConverterBase.YccKVector(8),
- 4,
- FeatureTestRunner.Deserialize(arg),
- new JpegColorConverterBase.YccKScalar(8));
- }
+ [Theory]
+ [MemberData(nameof(Seeds))]
+ public void FromRgbToYccKVector512(int seed) =>
+ this.TestConversionFromRgb(
+ new JpegColorConverterBase.YccKVector512(8),
+ 4,
+ seed,
+ new JpegColorConverterBase.YccKScalar(8),
+ precision: 2);
+
+ [Theory]
+ [MemberData(nameof(Seeds))]
+ public void FromRgbToYccKVector256(int seed) =>
+ this.TestConversionFromRgb(
+ new JpegColorConverterBase.YccKVector256(8),
+ 4,
+ seed,
+ new JpegColorConverterBase.YccKScalar(8),
+ precision: 2);
+
+ [Theory]
+ [MemberData(nameof(Seeds))]
+ public void FromRgbToYccKVector128(int seed) =>
+ this.TestConversionFromRgb(
+ new JpegColorConverterBase.YccKVector128(8),
+ 4,
+ seed,
+ new JpegColorConverterBase.YccKScalar(8),
+ precision: 2);
private void TestConversionToRgb(
JpegColorConverterBase converter,