From 5aca40718b44f7e236b4e363b8bd2d245121a347 Mon Sep 17 00:00:00 2001 From: Ynse Hoornenborg Date: Wed, 20 Nov 2024 21:21:14 +0100 Subject: [PATCH] Rename of test classes --- .../Heif/Av1/Entropy/Av1SymbolEncoder.cs | 38 +++++++++---------- ...ansformer.cs => Av1EchoTestTransformer.cs} | 2 +- .../{EntropyTests.cs => Av1EntropyTests.cs} | 2 +- .../Heif/Av1/Av1ForwardTransformTests.cs | 14 +++---- .../Heif/Av1/Av1InverseTransformTests.cs | 10 ++--- 5 files changed, 33 insertions(+), 33 deletions(-) rename tests/ImageSharp.Tests/Formats/Heif/Av1/{EchoTestTransformer.cs => Av1EchoTestTransformer.cs} (83%) rename tests/ImageSharp.Tests/Formats/Heif/Av1/{EntropyTests.cs => Av1EntropyTests.cs} (99%) diff --git a/src/ImageSharp/Formats/Heif/Av1/Entropy/Av1SymbolEncoder.cs b/src/ImageSharp/Formats/Heif/Av1/Entropy/Av1SymbolEncoder.cs index f28f161d86..1e79671dee 100644 --- a/src/ImageSharp/Formats/Heif/Av1/Entropy/Av1SymbolEncoder.cs +++ b/src/ImageSharp/Formats/Heif/Av1/Entropy/Av1SymbolEncoder.cs @@ -122,12 +122,12 @@ internal class Av1SymbolEncoder : IDisposable public int WriteCoefficients( Av1TransformSize transformSize, Av1TransformType transformType, - uint txb_index, // TODO: Doesn't seem to be used, remove. - Av1PredictionMode intraLumaDir, - Span coeff_buffer_ptr, + int txbIndex, // TODO: Doesn't seem to be used, remove. + Av1PredictionMode intraDirection, + Span coeffBuffer, Av1ComponentType componentType, - short txb_skip_ctx, - short dc_sign_ctx, + short transformBlockSkipContext, + short dcSignContext, ushort eob, bool useReducedTransformSet, int baseQIndex, @@ -151,17 +151,17 @@ internal class Av1SymbolEncoder : IDisposable Guard.MustBeLessThan((int)transformSizeContext, (int)Av1TransformSize.AllSizes, nameof(transformSizeContext)); bool hasEndOfBlock = eob != 0; - this.WriteSkip(!hasEndOfBlock, txb_skip_ctx); + this.WriteSkip(!hasEndOfBlock, transformBlockSkipContext); if (eob == 0) { return 0; } - InitializeLevels(coeff_buffer_ptr, width, height, levels); + InitializeLevels(coeffBuffer, width, height, levels); if (componentType == Av1ComponentType.Luminance) { - this.WriteTransformType(transformType, transformSize, useReducedTransformSet, baseQIndex, filterIntraMode, intraLumaDir); + this.WriteTransformType(transformType, transformSize, useReducedTransformSet, baseQIndex, filterIntraMode, intraDirection); } short endOfBlockPosition = GetEndOfBlockPosition(eob, out int eob_extra); @@ -186,7 +186,7 @@ internal class Av1SymbolEncoder : IDisposable for (c = eob - 1; c >= 0; --c) { short pos = scan[c]; - int v = coeff_buffer_ptr[pos]; + int v = coeffBuffer[pos]; short coeff_ctx = coeff_contexts[pos]; int level = Math.Abs(v); @@ -222,7 +222,7 @@ internal class Av1SymbolEncoder : IDisposable for (c = 0; c < eob; ++c) { short pos = scan[c]; - int v = coeff_buffer_ptr[pos]; + int v = coeffBuffer[pos]; int level = Math.Abs(v); cul_level += level; @@ -231,7 +231,7 @@ internal class Av1SymbolEncoder : IDisposable { if (c == 0) { - w.WriteSymbol((int)sign, this.dcSign[(int)componentType][dc_sign_ctx]); + w.WriteSymbol((int)sign, this.dcSign[(int)componentType][dcSignContext]); } else { @@ -248,22 +248,22 @@ internal class Av1SymbolEncoder : IDisposable cul_level = Math.Min(Av1Constants.CoefficientContextMask, cul_level); // DC value - SetDcSign(ref cul_level, coeff_buffer_ptr[0]); + SetDcSign(ref cul_level, coeffBuffer[0]); return cul_level; } /// /// SVT: set_dc_sign /// - private static void SetDcSign(ref int cul_level, int dc_val) + private static void SetDcSign(ref int culLevel, int dcValue) { - if (dc_val < 0) + if (dcValue < 0) { - cul_level |= 1 << Av1Constants.CoefficientContextBitCount; + culLevel |= 1 << Av1Constants.CoefficientContextBitCount; } - else if (dc_val > 0) + else if (dcValue > 0) { - cul_level += 2 << Av1Constants.CoefficientContextBitCount; + culLevel += 2 << Av1Constants.CoefficientContextBitCount; } } @@ -432,8 +432,8 @@ internal class Av1SymbolEncoder : IDisposable /// /// SVT: set_levels from EbCommonUtils.h /// - private static Span SetLevels(Span levels_buf, int width) - => levels_buf.Slice(Av1Constants.TransformPadTop * (width + Av1Constants.TransformPadHorizontal)); + private static Span SetLevels(Span levelsBuffer, int width) + => levelsBuffer.Slice(Av1Constants.TransformPadTop * (width + Av1Constants.TransformPadHorizontal)); private void WriteSkip(bool hasEndOfBlock, int context) { diff --git a/tests/ImageSharp.Tests/Formats/Heif/Av1/EchoTestTransformer.cs b/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1EchoTestTransformer.cs similarity index 83% rename from tests/ImageSharp.Tests/Formats/Heif/Av1/EchoTestTransformer.cs rename to tests/ImageSharp.Tests/Formats/Heif/Av1/Av1EchoTestTransformer.cs index 79c8f0c504..e47a77ad27 100644 --- a/tests/ImageSharp.Tests/Formats/Heif/Av1/EchoTestTransformer.cs +++ b/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1EchoTestTransformer.cs @@ -5,7 +5,7 @@ using SixLabors.ImageSharp.Formats.Heif.Av1.Transform; namespace SixLabors.ImageSharp.Tests.Formats.Heif.Av1; -internal class EchoTestTransformer : IAv1Forward1dTransformer +internal class Av1EchoTestTransformer : IAv1Forward1dTransformer { public void Transform(Span input, Span output, int cosBit, Span stageRange) => input.CopyTo(output); diff --git a/tests/ImageSharp.Tests/Formats/Heif/Av1/EntropyTests.cs b/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1EntropyTests.cs similarity index 99% rename from tests/ImageSharp.Tests/Formats/Heif/Av1/EntropyTests.cs rename to tests/ImageSharp.Tests/Formats/Heif/Av1/Av1EntropyTests.cs index e4c710ad7a..37c4aa4a61 100644 --- a/tests/ImageSharp.Tests/Formats/Heif/Av1/EntropyTests.cs +++ b/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1EntropyTests.cs @@ -9,7 +9,7 @@ using SixLabors.ImageSharp.Memory; namespace SixLabors.ImageSharp.Tests.Formats.Heif.Av1; [Trait("Format", "Avif")] -public class EntropyTests +public class Av1EntropyTests { private const int BaseQIndex = 23; diff --git a/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1ForwardTransformTests.cs b/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1ForwardTransformTests.cs index 488bc8726d..4300b642b6 100644 --- a/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1ForwardTransformTests.cs +++ b/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1ForwardTransformTests.cs @@ -85,7 +85,7 @@ public class Av1ForwardTransformTests Array.Fill(input, 1); int[] actual = new int[64 * 64]; Av1Transform2dFlipConfiguration config = new(transformType, transformSize); - IAv1Forward1dTransformer transformer = new EchoTestTransformer(); + IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer(); int width = transformSize.GetWidth(); int height = transformSize.GetHeight(); int blockSize = width * height; @@ -123,7 +123,7 @@ public class Av1ForwardTransformTests Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); config.SetFlip(false, false); config.SetShift(0, 0, 0); - IAv1Forward1dTransformer transformer = new EchoTestTransformer(); + IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer(); // Act Av1ForwardTransformer.Transform2d( @@ -157,7 +157,7 @@ public class Av1ForwardTransformTests Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); config.SetFlip(false, true); config.SetShift(0, 0, 0); - IAv1Forward1dTransformer transformer = new EchoTestTransformer(); + IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer(); // Act Av1ForwardTransformer.Transform2d( @@ -191,7 +191,7 @@ public class Av1ForwardTransformTests Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); config.SetFlip(true, false); config.SetShift(0, 0, 0); - IAv1Forward1dTransformer transformer = new EchoTestTransformer(); + IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer(); // Act Av1ForwardTransformer.Transform2d( @@ -225,7 +225,7 @@ public class Av1ForwardTransformTests Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); config.SetFlip(true, true); config.SetShift(0, 0, 0); - IAv1Forward1dTransformer transformer = new EchoTestTransformer(); + IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer(); // Act Av1ForwardTransformer.Transform2d( @@ -261,7 +261,7 @@ public class Av1ForwardTransformTests Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size8x4); config.SetFlip(true, false); config.SetShift(0, 0, 0); - IAv1Forward1dTransformer transformer = new EchoTestTransformer(); + IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer(); // Act Av1ForwardTransformer.Transform2d( @@ -305,7 +305,7 @@ public class Av1ForwardTransformTests Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x8); config.SetFlip(true, false); config.SetShift(0, 0, 0); - IAv1Forward1dTransformer transformer = new EchoTestTransformer(); + IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer(); // Act Av1ForwardTransformer.Transform2d( diff --git a/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1InverseTransformTests.cs b/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1InverseTransformTests.cs index a5983ef645..ce409789fa 100644 --- a/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1InverseTransformTests.cs +++ b/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1InverseTransformTests.cs @@ -74,7 +74,7 @@ public class Av1InverseTransformTests [Fact] public void AccuracyOfEchoTransformSize4Test() - => AssertAccuracy1d(Av1TransformType.Identity, Av1TransformSize.Size4x4, 0, new EchoTestTransformer(), new EchoTestTransformer()); + => AssertAccuracy1d(Av1TransformType.Identity, Av1TransformSize.Size4x4, 0, new Av1EchoTestTransformer(), new Av1EchoTestTransformer()); [Fact] public void FlipNothingTest() @@ -96,7 +96,7 @@ public class Av1InverseTransformTests config.GenerateStageRange(8); config.SetFlip(false, false); config.SetShift(0, 0, 0); - IAv1Forward1dTransformer transformer = new EchoTestTransformer(); + IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer(); // Act Av1Inverse2dTransformer.Transform2dAdd( @@ -132,7 +132,7 @@ public class Av1InverseTransformTests Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); config.SetFlip(false, true); config.SetShift(0, 0, 0); - IAv1Forward1dTransformer transformer = new EchoTestTransformer(); + IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer(); // Act Av1Inverse2dTransformer.Transform2dAdd( @@ -168,7 +168,7 @@ public class Av1InverseTransformTests Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); config.SetFlip(true, false); config.SetShift(0, 0, 0); - IAv1Forward1dTransformer transformer = new EchoTestTransformer(); + IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer(); // Act Av1Inverse2dTransformer.Transform2dAdd( @@ -204,7 +204,7 @@ public class Av1InverseTransformTests Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); config.SetFlip(true, true); config.SetShift(0, 0, 0); - IAv1Forward1dTransformer transformer = new EchoTestTransformer(); + IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer(); // Act Av1Inverse2dTransformer.Transform2dAdd(