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

Restored decoder parse stream only benchmark

pull/1694/head
Dmitry Pentin 5 years ago
parent
84900dcd29
commit
82e22c30b4
4 changed files with 82 additions and 65 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. 8
      src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
  2. 135
      tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegParseStreamOnly.cs
  3. 2
      tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
  4. 2
      tests/ImageSharp.Tests/Formats/Jpg/SpectralToPixelConversionTests.cs

8
src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
View File

@ -248,8 +248,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
/// </summary> /// </summary>
/// <param name="stream">The input stream.</param> /// <param name="stream">The input stream.</param>
/// <param name="scanDecoder">Scan decoder used exclusively to decode SOS marker.</param> /// <param name="scanDecoder">Scan decoder used exclusively to decode SOS marker.</param>
/// <param name="ct">The token to monitor cancellation.</param> /// <param name="cancellationToken">The token to monitor cancellation.</param>
internal void ParseStream(BufferedReadStream stream, HuffmanScanDecoder scanDecoder, CancellationToken ct) internal void ParseStream(BufferedReadStream stream, HuffmanScanDecoder scanDecoder, CancellationToken cancellationToken)
{ {
bool metadataOnly = scanDecoder == null; bool metadataOnly = scanDecoder == null;
@ -283,7 +283,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
while (fileMarker.Marker != JpegConstants.Markers.EOI while (fileMarker.Marker != JpegConstants.Markers.EOI
|| (fileMarker.Marker == JpegConstants.Markers.EOI && fileMarker.Invalid)) || (fileMarker.Marker == JpegConstants.Markers.EOI && fileMarker.Invalid))
{ {
ct.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
if (!fileMarker.Invalid) if (!fileMarker.Invalid)
{ {
@ -301,7 +301,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
case JpegConstants.Markers.SOS: case JpegConstants.Markers.SOS:
if (!metadataOnly) if (!metadataOnly)
{ {
this.ProcessStartOfScanMarker(stream, ct); this.ProcessStartOfScanMarker(stream, cancellationToken);
break; break;
} }
else else

135
tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegParseStreamOnly.cs
View File

@ -1,59 +1,76 @@
//// Copyright (c) Six Labors. // Copyright (c) Six Labors.
//// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
//using System.IO; using System.IO;
//using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Attributes;
//using SixLabors.ImageSharp.Formats.Jpeg; using SixLabors.ImageSharp.Formats.Jpeg;
//using SixLabors.ImageSharp.IO; using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
//using SixLabors.ImageSharp.Tests; using SixLabors.ImageSharp.IO;
//using SDSize = System.Drawing.Size; using SixLabors.ImageSharp.Tests;
using SDSize = System.Drawing.Size;
//namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
//{ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
// [Config(typeof(Config.ShortMultiFramework))] {
// public class DecodeJpegParseStreamOnly //[Config(typeof(Config.ShortMultiFramework))]
// { public class DecodeJpegParseStreamOnly
// [Params(TestImages.Jpeg.BenchmarkSuite.Lake_Small444YCbCr)] {
// public string TestImage { get; set; } [Params(TestImages.Jpeg.BenchmarkSuite.Lake_Small444YCbCr)]
public string TestImage { get; set; }
// private string TestImageFullPath => Path.Combine(TestEnvironment.InputImagesDirectoryFullPath, this.TestImage);
private string TestImageFullPath => Path.Combine(TestEnvironment.InputImagesDirectoryFullPath, this.TestImage);
// private byte[] jpegBytes;
private byte[] jpegBytes;
// [GlobalSetup]
// public void Setup() [GlobalSetup]
// => this.jpegBytes = File.ReadAllBytes(this.TestImageFullPath); public void Setup()
=> this.jpegBytes = File.ReadAllBytes(this.TestImageFullPath);
// [Benchmark(Baseline = true, Description = "System.Drawing FULL")]
// public SDSize JpegSystemDrawing() //[Benchmark(Baseline = true, Description = "System.Drawing FULL")]
// { //public SDSize JpegSystemDrawing()
// using var memoryStream = new MemoryStream(this.jpegBytes); //{
// using var image = System.Drawing.Image.FromStream(memoryStream); // using var memoryStream = new MemoryStream(this.jpegBytes);
// return image.Size; // using var image = System.Drawing.Image.FromStream(memoryStream);
// } // return image.Size;
//}
// [Benchmark(Description = "JpegDecoderCore.ParseStream")]
// public void ParseStream() [Benchmark(Description = "JpegDecoderCore.ParseStream")]
// { public void ParseStream()
// using var memoryStream = new MemoryStream(this.jpegBytes); {
// using var bufferedStream = new BufferedReadStream(Configuration.Default, memoryStream); using var memoryStream = new MemoryStream(this.jpegBytes);
using var bufferedStream = new BufferedReadStream(Configuration.Default, memoryStream);
// var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder { IgnoreMetadata = true });
// decoder.ParseStream(bufferedStream); var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder { IgnoreMetadata = true });
// decoder.Dispose(); var scanDecoder = new HuffmanScanDecoder(bufferedStream, new NoopSpectralConverter(), cancellationToken: default);
// } decoder.ParseStream(bufferedStream, scanDecoder, cancellationToken: default);
// } decoder.Dispose();
}
// /*
// | Method | Job | Runtime | TestImage | Mean | Error | StdDev | Ratio | Gen 0 | Gen 1 | Gen 2 | Allocated | // We want to test only stream parsing and scan decoding, we don't need to convert spectral data to actual pixels
// |---------------------------- |----------- |-------------- |--------------------- |---------:|----------:|----------:|------:|--------:|------:|------:|----------:| // Nor we need to allocate final pixel buffer
// | 'System.Drawing FULL' | Job-HITJFX | .NET 4.7.2 | Jpg/b(...)e.jpg [21] | 5.828 ms | 0.9885 ms | 0.0542 ms | 1.00 | 46.8750 | - | - | 211566 B | // Note: this still introduces virtual method call overhead for baseline interleaved images
// | JpegDecoderCore.ParseStream | Job-HITJFX | .NET 4.7.2 | Jpg/b(...)e.jpg [21] | 5.833 ms | 0.2923 ms | 0.0160 ms | 1.00 | - | - | - | 12416 B | // There's no way to eliminate it as spectral conversion is built into the scan decoding loop for memory footprint reduction
// | | | | | | | | | | | | | private class NoopSpectralConverter : SpectralConverter
// | 'System.Drawing FULL' | Job-WPSKZD | .NET Core 2.1 | Jpg/b(...)e.jpg [21] | 6.018 ms | 2.1374 ms | 0.1172 ms | 1.00 | 46.8750 | - | - | 210768 B | {
// | JpegDecoderCore.ParseStream | Job-WPSKZD | .NET Core 2.1 | Jpg/b(...)e.jpg [21] | 4.382 ms | 0.9009 ms | 0.0494 ms | 0.73 | - | - | - | 12360 B | public override void ConvertStrideBaseline()
// | | | | | | | | | | | | | {
// | 'System.Drawing FULL' | Job-ZLSNRP | .NET Core 3.1 | Jpg/b(...)e.jpg [21] | 5.714 ms | 0.4078 ms | 0.0224 ms | 1.00 | - | - | - | 176 B | }
// | JpegDecoderCore.ParseStream | Job-ZLSNRP | .NET Core 3.1 | Jpg/b(...)e.jpg [21] | 4.239 ms | 1.0943 ms | 0.0600 ms | 0.74 | - | - | - | 12406 B |
// */ public override void InjectFrameData(JpegFrame frame, IRawJpegData jpegData)
//} {
}
}
}
/*
| Method | Job | Runtime | TestImage | Mean | Error | StdDev | Ratio | Gen 0 | Gen 1 | Gen 2 | Allocated |
|---------------------------- |----------- |-------------- |--------------------- |---------:|----------:|----------:|------:|--------:|------:|------:|----------:|
| 'System.Drawing FULL' | Job-HITJFX | .NET 4.7.2 | Jpg/b(...)e.jpg [21] | 5.828 ms | 0.9885 ms | 0.0542 ms | 1.00 | 46.8750 | - | - | 211566 B |
| JpegDecoderCore.ParseStream | Job-HITJFX | .NET 4.7.2 | Jpg/b(...)e.jpg [21] | 5.833 ms | 0.2923 ms | 0.0160 ms | 1.00 | - | - | - | 12416 B |
| | | | | | | | | | | | |
| 'System.Drawing FULL' | Job-WPSKZD | .NET Core 2.1 | Jpg/b(...)e.jpg [21] | 6.018 ms | 2.1374 ms | 0.1172 ms | 1.00 | 46.8750 | - | - | 210768 B |
| JpegDecoderCore.ParseStream | Job-WPSKZD | .NET Core 2.1 | Jpg/b(...)e.jpg [21] | 4.382 ms | 0.9009 ms | 0.0494 ms | 0.73 | - | - | - | 12360 B |
| | | | | | | | | | | | |
| 'System.Drawing FULL' | Job-ZLSNRP | .NET Core 3.1 | Jpg/b(...)e.jpg [21] | 5.714 ms | 0.4078 ms | 0.0224 ms | 1.00 | - | - | - | 176 B |
| JpegDecoderCore.ParseStream | Job-ZLSNRP | .NET Core 3.1 | Jpg/b(...)e.jpg [21] | 4.239 ms | 1.0943 ms | 0.0600 ms | 0.74 | - | - | - | 12406 B |
*/
}

2
tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
View File

@ -90,7 +90,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
var scanDecoder = new HuffmanScanDecoder(bufferedStream, debugConverter, cancellationToken: default); var scanDecoder = new HuffmanScanDecoder(bufferedStream, debugConverter, cancellationToken: default);
// This would parse entire image // This would parse entire image
decoder.ParseStream(bufferedStream, scanDecoder, ct: default); decoder.ParseStream(bufferedStream, scanDecoder, cancellationToken: default);
// Actual verification // Actual verification
this.VerifySpectralCorrectnessImpl(libJpegData, debugConverter.SpectralData); this.VerifySpectralCorrectnessImpl(libJpegData, debugConverter.SpectralData);

2
tests/ImageSharp.Tests/Formats/Jpg/SpectralToPixelConversionTests.cs
View File

@ -46,7 +46,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
using var converter = new SpectralConverter<TPixel>(Configuration.Default, cancellationToken: default); using var converter = new SpectralConverter<TPixel>(Configuration.Default, cancellationToken: default);
var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder()); var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder());
var scanDecoder = new HuffmanScanDecoder(bufferedStream, converter, cancellationToken: default); var scanDecoder = new HuffmanScanDecoder(bufferedStream, converter, cancellationToken: default);
decoder.ParseStream(bufferedStream, scanDecoder, ct: default); decoder.ParseStream(bufferedStream, scanDecoder, cancellationToken: default);
// Test metadata // Test metadata
provider.Utility.TestGroupName = nameof(JpegDecoderTests); provider.Utility.TestGroupName = nameof(JpegDecoderTests);

Write Preview
Loading…
Cancel
Save