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

removed unnecessary methods

af/merge-core
Anton Firszov 10 years ago
parent
308b92048d
commit
be4b7d5232
2 changed files with 5 additions and 224 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 141
      src/ImageSharp46/Formats/Jpg/Components/Block8x8F.cs
  2. 88
      tests/ImageSharp.Tests46/Formats/Jpg/Block8x8FTests.cs

141
src/ImageSharp46/Formats/Jpg/Components/Block8x8F.cs
View File

@ -66,6 +66,7 @@ namespace ImageSharp.Formats
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public unsafe void CopyTo(float[] dest)
{
@ -132,50 +133,7 @@ namespace ImageSharp.Formats
}
}
/// <summary>
/// Reference implementation we can benchmark against
/// </summary>
internal unsafe void TransposeInto_PinningImpl(ref Block8x8F destination)
{
fixed (Vector4* sPtr = &V0L)
{
float* src = (float*) sPtr;
fixed (Vector4* dPtr = &destination.V0L)
{
float* dest = (float*) dPtr;
for (int i = 0; i < 8; i++)
{
int i8 = i*8;
for (int j = 0; j < 8; j++)
{
dest[j*8 + i] = src[i8 + j];
}
}
}
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static unsafe void TransposeInto(Block8x8F* sourcePtr, Block8x8F* destPtr)
{
float* src = (float*) sourcePtr;
float* dest = (float*) destPtr;
for (int i = 0; i < 8; i++)
{
int i8 = i*8;
for (int j = 0; j < 8; j++)
{
dest[j*8 + i] = src[i8 + j];
}
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void MultiplyAllInplace(Vector4 s)
{
@ -448,30 +406,7 @@ namespace ImageSharp.Formats
for(i = 0;i < 8;i++){ x[i] *= 0.353554f; }
*/
}
internal static void SuchIDCT(ref Block block)
{
Block8x8F source = new Block8x8F();
source.LoadFrom(block.Data);
Block8x8F dest = new Block8x8F();
Block8x8F temp = new Block8x8F();
source.IDCTInto(ref dest, ref temp);
dest.CopyTo(block.Data);
}
internal static void SuchIDCT(ref BlockF block)
{
Block8x8F source = new Block8x8F();
source.LoadFrom(block.Data);
Block8x8F dest = new Block8x8F();
Block8x8F temp = new Block8x8F();
source.IDCTInto(ref dest, ref temp);
dest.CopyTo(block.Data);
}
public unsafe float this[int idx]
{
@ -495,20 +430,6 @@ namespace ImageSharp.Formats
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal static unsafe void UnZig(Block8x8F* block, Block8x8F* qt, int* unzigPtr)
{
float* b = (float*) block;
float* qtp = (float*) qt;
for (int zig = 0; zig < BlockF.BlockSize; zig++)
{
float* unzigPos = b + unzigPtr[zig];
float val = *unzigPos;
val *= qtp[zig];
*unzigPos = val;
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal static unsafe float GetScalarAt(Block8x8F* blockPtr, int idx)
{
@ -538,62 +459,6 @@ namespace ImageSharp.Formats
{
CopyTo(legacyBlock.Data);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static byte ToColorByte(float c)
{
if (c < -128)
{
return 0;
}
else if (c > 127)
{
return 255;
}
else
{
c += 128;
return (byte) c;
}
}
internal unsafe void CopyColorsTo(MutableSpan<byte> buffer, int stride)
{
fixed (Block8x8F* p = &this)
{
float* b = (float*) p;
for (int y = 0; y < 8; y++)
{
int y8 = y*8;
int yStride = y*stride;
for (int x = 0; x < 8; x++)
{
float c = b[y8 + x];
if (c < -128)
{
c = 0;
}
else if (c > 127)
{
c = 255;
}
else
{
c += 128;
}
buffer[yStride + x] = (byte) c;
}
}
}
}
private static readonly Vector4 CMin4 = new Vector4(-128f);
private static readonly Vector4 CMax4 = new Vector4(127f);

88
tests/ImageSharp.Tests46/Formats/Jpg/Block8x8FTests.cs
View File

@ -171,24 +171,7 @@ namespace ImageSharp.Tests.Formats.Jpg
Assert.Equal(expected, actual);
}
[Fact]
public void TranposeInto_PinningImpl()
{
float[] expected = Create8x8FloatData();
ReferenceImplementations.Transpose8x8(expected);
Block8x8F source = new Block8x8F();
source.LoadFrom(Create8x8FloatData());
Block8x8F dest = new Block8x8F();
source.TransposeInto_PinningImpl(ref dest);
float[] actual = new float[64];
dest.CopyTo(actual);
Assert.Equal(expected, actual);
}
[Fact]
public void TransposeInto()
@ -209,27 +192,6 @@ namespace ImageSharp.Tests.Formats.Jpg
}
[Fact]
public unsafe void TransposeInto_WithPointers()
{
float[] expected = Create8x8FloatData();
ReferenceImplementations.Transpose8x8(expected);
Block8x8F source = new Block8x8F();
source.LoadFrom(Create8x8FloatData());
Block8x8F dest = new Block8x8F();
Block8x8F* sPtr = &source;
Block8x8F* dPtr = &dest;
Block8x8F.TransposeInto(sPtr, dPtr);
float[] actual = new float[64];
dest.CopyTo(actual);
Assert.Equal(expected, actual);
}
private class BufferHolder
{
@ -255,53 +217,7 @@ namespace ImageSharp.Tests.Formats.Jpg
Output.WriteLine($"TranposeInto_PinningImpl_Benchmark finished in {sw.ElapsedMilliseconds} ms");
}
[Fact]
public void TranposeInto_PinningImpl_Benchmark()
{
BufferHolder source = new BufferHolder();
source.Buffer.LoadFrom(Create8x8FloatData());
BufferHolder dest = new BufferHolder();
Output.WriteLine($"TranposeInto_PinningImpl_Benchmark X {Times} ...");
Stopwatch sw = Stopwatch.StartNew();
for (int i = 0; i < Times; i++)
{
source.Buffer.TransposeInto_PinningImpl(ref dest.Buffer);
}
sw.Stop();
Output.WriteLine($"TranposeInto_PinningImpl_Benchmark finished in {sw.ElapsedMilliseconds} ms");
}
[Fact]
public unsafe void TransposeInto_WithPointers_Benchmark()
{
BufferHolder source = new BufferHolder();
source.Buffer.LoadFrom(Create8x8FloatData());
BufferHolder dest = new BufferHolder();
fixed (Block8x8F* sPtr = &source.Buffer)
{
fixed (Block8x8F* dPtr = &dest.Buffer)
{
Output.WriteLine($"TransposeInto_WithPointers_Benchmark X {Times} ...");
Stopwatch sw = Stopwatch.StartNew();
for (int i = 0; i < Times; i++)
{
Block8x8F.TransposeInto(sPtr, dPtr);
}
sw.Stop();
Output.WriteLine($"TransposeInto_WithPointers_Benchmark finished in {sw.ElapsedMilliseconds} ms");
}
}
}
[Fact]
public void iDCT2D8x4_LeftPart()
{

Write Preview
Loading…
Cancel
Save