tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Rename of test classes

pull/2633/head
Ynse Hoornenborg 2 years ago
parent
682b05c5d0
commit
5aca40718b
5 changed files with 33 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/ImageSharp/Formats/Heif/Av1/Entropy/Av1SymbolEncoder.cs
  2. 2
      tests/ImageSharp.Tests/Formats/Heif/Av1/Av1EchoTestTransformer.cs
  3. 2
      tests/ImageSharp.Tests/Formats/Heif/Av1/Av1EntropyTests.cs
  4. 14
      tests/ImageSharp.Tests/Formats/Heif/Av1/Av1ForwardTransformTests.cs
  5. 10
      tests/ImageSharp.Tests/Formats/Heif/Av1/Av1InverseTransformTests.cs

38
src/ImageSharp/Formats/Heif/Av1/Entropy/Av1SymbolEncoder.cs
View File

@ -122,12 +122,12 @@ internal class Av1SymbolEncoder : IDisposable
public int WriteCoefficients( public int WriteCoefficients(
Av1TransformSize transformSize, Av1TransformSize transformSize,
Av1TransformType transformType, Av1TransformType transformType,
uint txb_index, // TODO: Doesn't seem to be used, remove. int txbIndex, // TODO: Doesn't seem to be used, remove.
Av1PredictionMode intraLumaDir, Av1PredictionMode intraDirection,
Span<int> coeff_buffer_ptr, Span<int> coeffBuffer,
Av1ComponentType componentType, Av1ComponentType componentType,
short txb_skip_ctx, short transformBlockSkipContext,
short dc_sign_ctx, short dcSignContext,
ushort eob, ushort eob,
bool useReducedTransformSet, bool useReducedTransformSet,
int baseQIndex, int baseQIndex,
@ -151,17 +151,17 @@ internal class Av1SymbolEncoder : IDisposable
Guard.MustBeLessThan((int)transformSizeContext, (int)Av1TransformSize.AllSizes, nameof(transformSizeContext)); Guard.MustBeLessThan((int)transformSizeContext, (int)Av1TransformSize.AllSizes, nameof(transformSizeContext));
bool hasEndOfBlock = eob != 0; bool hasEndOfBlock = eob != 0;
this.WriteSkip(!hasEndOfBlock, txb_skip_ctx); this.WriteSkip(!hasEndOfBlock, transformBlockSkipContext);
if (eob == 0) if (eob == 0)
{ {
return 0; return 0;
} }
InitializeLevels(coeff_buffer_ptr, width, height, levels); InitializeLevels(coeffBuffer, width, height, levels);
if (componentType == Av1ComponentType.Luminance) 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); short endOfBlockPosition = GetEndOfBlockPosition(eob, out int eob_extra);
@ -186,7 +186,7 @@ internal class Av1SymbolEncoder : IDisposable
for (c = eob - 1; c >= 0; --c) for (c = eob - 1; c >= 0; --c)
{ {
short pos = scan[c]; short pos = scan[c];
int v = coeff_buffer_ptr[pos]; int v = coeffBuffer[pos];
short coeff_ctx = coeff_contexts[pos]; short coeff_ctx = coeff_contexts[pos];
int level = Math.Abs(v); int level = Math.Abs(v);
@ -222,7 +222,7 @@ internal class Av1SymbolEncoder : IDisposable
for (c = 0; c < eob; ++c) for (c = 0; c < eob; ++c)
{ {
short pos = scan[c]; short pos = scan[c];
int v = coeff_buffer_ptr[pos]; int v = coeffBuffer[pos];
int level = Math.Abs(v); int level = Math.Abs(v);
cul_level += level; cul_level += level;
@ -231,7 +231,7 @@ internal class Av1SymbolEncoder : IDisposable
{ {
if (c == 0) if (c == 0)
{ {
w.WriteSymbol((int)sign, this.dcSign[(int)componentType][dc_sign_ctx]); w.WriteSymbol((int)sign, this.dcSign[(int)componentType][dcSignContext]);
} }
else else
{ {
@ -248,22 +248,22 @@ internal class Av1SymbolEncoder : IDisposable
cul_level = Math.Min(Av1Constants.CoefficientContextMask, cul_level); cul_level = Math.Min(Av1Constants.CoefficientContextMask, cul_level);
// DC value // DC value
SetDcSign(ref cul_level, coeff_buffer_ptr[0]); SetDcSign(ref cul_level, coeffBuffer[0]);
return cul_level; return cul_level;
} }
/// <summary> /// <summary>
/// SVT: set_dc_sign /// SVT: set_dc_sign
/// </summary> /// </summary>
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
/// <summary> /// <summary>
/// SVT: set_levels from EbCommonUtils.h /// SVT: set_levels from EbCommonUtils.h
/// </summary> /// </summary>
private static Span<byte> SetLevels(Span<byte> levels_buf, int width) private static Span<byte> SetLevels(Span<byte> levelsBuffer, int width)
=> levels_buf.Slice(Av1Constants.TransformPadTop * (width + Av1Constants.TransformPadHorizontal)); => levelsBuffer.Slice(Av1Constants.TransformPadTop * (width + Av1Constants.TransformPadHorizontal));
private void WriteSkip(bool hasEndOfBlock, int context) private void WriteSkip(bool hasEndOfBlock, int context)
{ {

2
tests/ImageSharp.Tests/Formats/Heif/Av1/EchoTestTransformer.cs → tests/ImageSharp.Tests/Formats/Heif/Av1/Av1EchoTestTransformer.cs
View File

@ -5,7 +5,7 @@ using SixLabors.ImageSharp.Formats.Heif.Av1.Transform;
namespace SixLabors.ImageSharp.Tests.Formats.Heif.Av1; namespace SixLabors.ImageSharp.Tests.Formats.Heif.Av1;
internal class EchoTestTransformer : IAv1Forward1dTransformer internal class Av1EchoTestTransformer : IAv1Forward1dTransformer
{ {
public void Transform(Span<int> input, Span<int> output, int cosBit, Span<byte> stageRange) public void Transform(Span<int> input, Span<int> output, int cosBit, Span<byte> stageRange)
=> input.CopyTo(output); => input.CopyTo(output);

2
tests/ImageSharp.Tests/Formats/Heif/Av1/EntropyTests.cs → tests/ImageSharp.Tests/Formats/Heif/Av1/Av1EntropyTests.cs
View File

@ -9,7 +9,7 @@ using SixLabors.ImageSharp.Memory;
namespace SixLabors.ImageSharp.Tests.Formats.Heif.Av1; namespace SixLabors.ImageSharp.Tests.Formats.Heif.Av1;
[Trait("Format", "Avif")] [Trait("Format", "Avif")]
public class EntropyTests public class Av1EntropyTests
{ {
private const int BaseQIndex = 23; private const int BaseQIndex = 23;

14
tests/ImageSharp.Tests/Formats/Heif/Av1/Av1ForwardTransformTests.cs
View File

@ -85,7 +85,7 @@ public class Av1ForwardTransformTests
Array.Fill<short>(input, 1); Array.Fill<short>(input, 1);
int[] actual = new int[64 * 64]; int[] actual = new int[64 * 64];
Av1Transform2dFlipConfiguration config = new(transformType, transformSize); Av1Transform2dFlipConfiguration config = new(transformType, transformSize);
IAv1Forward1dTransformer transformer = new EchoTestTransformer(); IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer();
int width = transformSize.GetWidth(); int width = transformSize.GetWidth();
int height = transformSize.GetHeight(); int height = transformSize.GetHeight();
int blockSize = width * height; int blockSize = width * height;
@ -123,7 +123,7 @@ public class Av1ForwardTransformTests
Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4);
config.SetFlip(false, false); config.SetFlip(false, false);
config.SetShift(0, 0, 0); config.SetShift(0, 0, 0);
IAv1Forward1dTransformer transformer = new EchoTestTransformer(); IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer();
// Act // Act
Av1ForwardTransformer.Transform2d( Av1ForwardTransformer.Transform2d(
@ -157,7 +157,7 @@ public class Av1ForwardTransformTests
Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4);
config.SetFlip(false, true); config.SetFlip(false, true);
config.SetShift(0, 0, 0); config.SetShift(0, 0, 0);
IAv1Forward1dTransformer transformer = new EchoTestTransformer(); IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer();
// Act // Act
Av1ForwardTransformer.Transform2d( Av1ForwardTransformer.Transform2d(
@ -191,7 +191,7 @@ public class Av1ForwardTransformTests
Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4);
config.SetFlip(true, false); config.SetFlip(true, false);
config.SetShift(0, 0, 0); config.SetShift(0, 0, 0);
IAv1Forward1dTransformer transformer = new EchoTestTransformer(); IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer();
// Act // Act
Av1ForwardTransformer.Transform2d( Av1ForwardTransformer.Transform2d(
@ -225,7 +225,7 @@ public class Av1ForwardTransformTests
Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4);
config.SetFlip(true, true); config.SetFlip(true, true);
config.SetShift(0, 0, 0); config.SetShift(0, 0, 0);
IAv1Forward1dTransformer transformer = new EchoTestTransformer(); IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer();
// Act // Act
Av1ForwardTransformer.Transform2d( Av1ForwardTransformer.Transform2d(
@ -261,7 +261,7 @@ public class Av1ForwardTransformTests
Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size8x4); Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size8x4);
config.SetFlip(true, false); config.SetFlip(true, false);
config.SetShift(0, 0, 0); config.SetShift(0, 0, 0);
IAv1Forward1dTransformer transformer = new EchoTestTransformer(); IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer();
// Act // Act
Av1ForwardTransformer.Transform2d( Av1ForwardTransformer.Transform2d(
@ -305,7 +305,7 @@ public class Av1ForwardTransformTests
Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x8); Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x8);
config.SetFlip(true, false); config.SetFlip(true, false);
config.SetShift(0, 0, 0); config.SetShift(0, 0, 0);
IAv1Forward1dTransformer transformer = new EchoTestTransformer(); IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer();
// Act // Act
Av1ForwardTransformer.Transform2d( Av1ForwardTransformer.Transform2d(

10
tests/ImageSharp.Tests/Formats/Heif/Av1/Av1InverseTransformTests.cs
View File

@ -74,7 +74,7 @@ public class Av1InverseTransformTests
[Fact] [Fact]
public void AccuracyOfEchoTransformSize4Test() public void AccuracyOfEchoTransformSize4Test()
=> AssertAccuracy1d(Av1TransformType.Identity, Av1TransformSize.Size4x4, 0, new EchoTestTransformer(), new EchoTestTransformer()); => AssertAccuracy1d(Av1TransformType.Identity, Av1TransformSize.Size4x4, 0, new Av1EchoTestTransformer(), new Av1EchoTestTransformer());
[Fact] [Fact]
public void FlipNothingTest() public void FlipNothingTest()
@ -96,7 +96,7 @@ public class Av1InverseTransformTests
config.GenerateStageRange(8); config.GenerateStageRange(8);
config.SetFlip(false, false); config.SetFlip(false, false);
config.SetShift(0, 0, 0); config.SetShift(0, 0, 0);
IAv1Forward1dTransformer transformer = new EchoTestTransformer(); IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer();
// Act // Act
Av1Inverse2dTransformer.Transform2dAdd( Av1Inverse2dTransformer.Transform2dAdd(
@ -132,7 +132,7 @@ public class Av1InverseTransformTests
Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4);
config.SetFlip(false, true); config.SetFlip(false, true);
config.SetShift(0, 0, 0); config.SetShift(0, 0, 0);
IAv1Forward1dTransformer transformer = new EchoTestTransformer(); IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer();
// Act // Act
Av1Inverse2dTransformer.Transform2dAdd( Av1Inverse2dTransformer.Transform2dAdd(
@ -168,7 +168,7 @@ public class Av1InverseTransformTests
Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4);
config.SetFlip(true, false); config.SetFlip(true, false);
config.SetShift(0, 0, 0); config.SetShift(0, 0, 0);
IAv1Forward1dTransformer transformer = new EchoTestTransformer(); IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer();
// Act // Act
Av1Inverse2dTransformer.Transform2dAdd( Av1Inverse2dTransformer.Transform2dAdd(
@ -204,7 +204,7 @@ public class Av1InverseTransformTests
Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4); Av1Transform2dFlipConfiguration config = new(Av1TransformType.Identity, Av1TransformSize.Size4x4);
config.SetFlip(true, true); config.SetFlip(true, true);
config.SetShift(0, 0, 0); config.SetShift(0, 0, 0);
IAv1Forward1dTransformer transformer = new EchoTestTransformer(); IAv1Forward1dTransformer transformer = new Av1EchoTestTransformer();
// Act // Act
Av1Inverse2dTransformer.Transform2dAdd( Av1Inverse2dTransformer.Transform2dAdd(

Write Preview
Loading…
Cancel
Save