Add progressive JPEG encoder by ardabada · Pull Request #2740 · SixLabors/ImageSharp

ardabada · 2024-05-21T16:56:48Z

Prerequisites

I have written a descriptive pull-request title
I have verified that there are no overlapping pull-requests open
I have verified that I am following the existing coding patterns and practice as demonstrated in the repository. These follow strict Stylecop rules 👮.
I have provided test coverage for my change (where applicable)

Description

This PR adds progressive JPEG encoder (see #10 and #449).
Implementation adapted from https://github.com/vstroebel/jpeg-encoder

No tests added yet. Restart interval also should be added.
Please take a look if it makes sense to you.

CLAassistant · 2024-05-21T16:56:53Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ ardabada
✅ JimBobSquarePants
❌ Alexandr Ivanov

Alexandr Ivanov seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

JimBobSquarePants · 2024-05-22T06:24:40Z

Wow! Thanks @ardabada

Tests are failing just now due to a minor StyleCop issue (trailing space) would it be possible to fix that and add some additional unit tests to verify the encoded output?

@br3aker would you be able to help review this? It reuses most of the work you implemented.

ardabada · 2024-05-22T21:02:39Z

Hi @JimBobSquarePants, I've added a test. The test suite seems quite complicated to me, and I need more time to understand how it works before I can write more complex, byte-level tests.

I've also split the WriteBlock method into two separate methods: WriteDc and WriteAcBlock. This change was necessary because the progressive encoder requires different values in the for loop when writing AC components. Additionally, I've updated the final if statement for writing the end of the block to check runLength > 0 instead of lastValuableIndex, since runLength is reset when encountering a non-zero coefficient. I hope this makes sense. CC @br3aker

I'd like to add a restart interval as well, but it seems to require more changes. WriteMarker is currently in JpegEncoderCore, and it should be called from HuffmanScanEncoder, which isn't an ideal solution. Therefore, I will postpone this for now.

JimBobSquarePants · 2024-05-30T10:05:02Z

Hi @JimBobSquarePants, I've added a test. The test suite seems quite complicated to me, and I need more time to understand how it works before I can write more complex, byte-level tests.

I've also split the WriteBlock method into two separate methods: WriteDc and WriteAcBlock. This change was necessary because the progressive encoder requires different values in the for loop when writing AC components. Additionally, I've updated the final if statement for writing the end of the block to check runLength > 0 instead of lastValuableIndex, since runLength is reset when encountering a non-zero coefficient. I hope this makes sense. CC @br3aker

I'd like to add a restart interval as well, but it seems to require more changes. WriteMarker is currently in JpegEncoderCore, and it should be called from HuffmanScanEncoder, which isn't an ideal solution. Therefore, I will postpone this for now.

Thanks for the updates! I've no issue with duplicate WriteMarker calls for now if you find it easier to go that way..

I'll pull down your code ASAP and have a good read through. Maybe I can help write tests.

JimBobSquarePants · 2024-06-18T04:37:18Z

Hi @ardabada apologies for the slow response. The code all looks great so far!

I think you can either

Add a duplicate WriteMarkerHeader method to the HuffmanScanEncoder.
Make WriteMarkerHeader static and internal passing the stream as a parameter.

I'm happy with whatever approach you take.

For tests I would keep it high level and simply encode/verify the output against expected results.

JimBobSquarePants · 2024-07-12T10:34:59Z

+    [WithFile(TestImages.Png.BikeGrayscale, nameof(LuminanceEncodingSetups), PixelTypes.L8)]
+    [WithFile(TestImages.Jpeg.Baseline.Cmyk, nameof(CmykEncodingSetups), PixelTypes.Rgb24)]
+    [WithFile(TestImages.Jpeg.Baseline.Ycck, nameof(YcckEncodingSetups), PixelTypes.Rgb24)]
+    public void EncodeProgressive_DefaultNumberOfScans<TPixel>(TestImageProvider<TPixel> provider, JpegEncodingColor colorType, int quality, float tolerance)


If you can add an additional test setting the restart interval this would be good to merge! 👍

JimBobSquarePants · 2024-07-26T03:14:17Z

@ardabada I pulled down your code and added the following test. It appears that writing anything other than the default value causes our decoder to fail.

[Theory]
[WithFile(TestImages.Png.CalliphoraPartial, nameof(NonSubsampledEncodingSetups), PixelTypes.Rgb24)]
[WithFile(TestImages.Png.CalliphoraPartial, nameof(SubsampledEncodingSetups), PixelTypes.Rgb24)]
[WithFile(TestImages.Png.BikeGrayscale, nameof(LuminanceEncodingSetups), PixelTypes.L8)]
[WithFile(TestImages.Jpeg.Baseline.Cmyk, nameof(CmykEncodingSetups), PixelTypes.Rgb24)]
[WithFile(TestImages.Jpeg.Baseline.Ycck, nameof(YcckEncodingSetups), PixelTypes.Rgb24)]
public void EncodeProgressive_CustomNumberOfScans<TPixel>(TestImageProvider<TPixel> provider, JpegEncodingColor colorType, int quality, float tolerance)
where TPixel : unmanaged, IPixel<TPixel>
{
    using Image<TPixel> image = provider.GetImage();

    JpegEncoder encoder = new()
    {
        Quality = quality,
        ColorType = colorType,
        Progressive = true,
        RestartInterval = 7
    };
    string info = $"{colorType}-Q{quality}";

    using MemoryStream ms = new();
    image.SaveAsJpeg(ms, encoder);
    ms.Position = 0;

    // TEMP: Save decoded output as PNG so we can do a pixel compare.
    using Image<TPixel> image2 = Image.Load<TPixel>(ms);
    image2.DebugSave(provider, testOutputDetails: info, extension: "png");

    ImageComparer comparer = new TolerantImageComparer(tolerance);
    image.VerifyEncoder(provider, "jpeg", info, encoder, comparer, referenceImageExtension: "jpg");
}

Here's an encoded jpeg which seems to be decodable by browsers, Windows, and System.Drawing.

And here's how our decoder sees it.

I did find an issue with DRI marker writing where we were writing too many bytes to the stream (see fixed version below)

/// <summary>
/// Writes the DRI marker
/// </summary>
/// <param name="restartInterval">Numbers of MCUs between restart markers.</param>
/// <param name="buffer">Temporary buffer.</param>
private void WriteDri(int restartInterval, Span<byte> buffer)
{
    if (restartInterval <= 0)
    {
        return;
    }

    this.WriteMarkerHeader(JpegConstants.Markers.DRI, 4, buffer);

    buffer[1] = (byte)(restartInterval & 0xff);
    buffer[0] = (byte)((restartInterval >> 8) & 0xff);
    this.outputStream.Write(buffer, 0, 2); // See explicit offset and length.
}

However, I think the issue is with the HuffmanScanDecoder. I've done some debugging and it's finding the markers well enough, perhaps something is not getting reset properly?

@br3aker If you have any time to help out here it would be greatly appreciated.

ardabada · 2024-08-02T08:15:30Z

Hi, @JimBobSquarePants, sorry for such long silence. I am currently looking into the JpegBitReader, looks like bitstream adjustment to start on the next byte boundary is not handled properly. As a suggestion, we can take restart interval in a separate PR

JimBobSquarePants · 2024-08-02T09:09:38Z

Hi, @JimBobSquarePants, sorry for such long silence. I am currently looking into the JpegBitReader, looks like bitstream adjustment to start on the next byte boundary is not handled properly. As a suggestion, we can take restart interval in a separate PR

No worries at all and thanks for replying. I'd like to get the bug in the reader fixed if possible before merging so that we don't forget. Would you be happy to investigate?

ardabada · 2024-10-08T15:29:54Z

Hi @JimBobSquarePants. PR updated. Looks like decoder is fixed now.
However i don't really like the duplicated ifs for restart intervals, are you ok with such approach or it's better to keep it in separate methods and track restarts to go in a field?

JimBobSquarePants · 2024-10-10T08:23:22Z

Legend! Thanks for fixing it. I’ll pull down and review ASAP

JimBobSquarePants

This is fantastic thank you. I feature I've wanted for many years!

JimBobSquarePants · 2024-10-12T04:11:54Z

                    this.FlushToStream();
                }
+
+                if (this.restartInterval > 0)


Multiple if is fine here. Libjpeg turbo does the same.

Updated [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) from 2.1.9 to 4.1.2. <details> <summary>Release notes</summary> _Sourced from [SixLabors.ImageSharp's releases](https://github.com/SixLabors/ImageSharp/releases)._ ## 4.1.2 ## What's Changed * Harden codec and metadata input validation by @JimBobSquarePants in SixLabors/ImageSharp#3187 * Fix TIFF decoding of legacy 8-bit color maps by @JimBobSquarePants in SixLabors/ImageSharp#3189 **Full Changelog**: SixLabors/ImageSharp@v4.1.1...v4.1.2 ## 4.1.1 ## What's Changed * Fix CCITT decompressor bounds checks and error handling by @JimBobSquarePants in SixLabors/ImageSharp#3176 **Full Changelog**: SixLabors/ImageSharp@v4.1.0...v4.1.1 ## 4.1.0 ## What's Changed * GIF: background handling & quantizer overflow fix by @JimBobSquarePants in SixLabors/ImageSharp#3133 * Validate PBM max pixel value by @JimBobSquarePants in SixLabors/ImageSharp#3134 * Add support for Apple CgBI PNG images by @Erik-White in SixLabors/ImageSharp#3136 * Fix GIF transparency handling and dither by @JimBobSquarePants in SixLabors/ImageSharp#3143 * Bump codecov/codecov-action from 6 to 7 by @dependabot[bot] in SixLabors/ImageSharp#3141 * Add BlendWithCoverage overloads. Optimize Rgba32 compatible shuffling. by @JimBobSquarePants in SixLabors/ImageSharp#3150 * Bump actions/checkout from 6 to 7 by @dependabot[bot] in SixLabors/ImageSharp#3146 * Bump actions/cache from 5 to 6 by @dependabot[bot] in SixLabors/ImageSharp#3149 * Fix convolution sampling for bounds smaller than the kernel radius by @JimBobSquarePants in SixLabors/ImageSharp#3152 * Enhance pixel formats and associated-alpha operations with optimizations by @JimBobSquarePants in SixLabors/ImageSharp#3154 * Bump actions/setup-dotnet from 5 to 6 by @dependabot[bot] in SixLabors/ImageSharp#3155 * Fix degeneracy check for resize transforms by @JimBobSquarePants in SixLabors/ImageSharp#3157 * Improvements to Apple CgBI PNG handling by @Erik-White in SixLabors/ImageSharp#3137 * Clone TIFF profiles into image metadata by @JimBobSquarePants in SixLabors/ImageSharp#3159 * Add AOT compiler seeds for pixel formats and ICO, CUR, QOI codecs by @JimBobSquarePants in SixLabors/ImageSharp#3160 * Normalize SIMD pipelines using TensorPrimitives_ by @JimBobSquarePants in SixLabors/ImageSharp#3161 * Add ANI decoder support by @Poker-sang in SixLabors/ImageSharp#2899 * Remove AntialiasThreshold from GraphicsOptions by @JimBobSquarePants in SixLabors/ImageSharp#3162 * Add plus and extended pixel blend modes by @JimBobSquarePants in SixLabors/ImageSharp#3163 * Fix 16-bit binary PBM sample byte order by @JimBobSquarePants in SixLabors/ImageSharp#3164 * Make MemoryAllocator limits configurable and extensible by @JimBobSquarePants in SixLabors/ImageSharp#3165 ## New Contributors * @Erik-White made their first contribution in SixLabors/ImageSharp#3136 **Full Changelog**: SixLabors/ImageSharp@v4.0.0...v4.1.0 ## 4.0.0 ## What's Changed * Update to net8 by @stefannikolei in SixLabors/ImageSharp#2583 * Handle dedup of local palette of 256 length - Main by @JimBobSquarePants in SixLabors/ImageSharp#2607 * Replace custom Crc32 by @JimBobSquarePants in SixLabors/ImageSharp#2611 * Sync 3.1 DrawImage fixes by @tocsoft in SixLabors/ImageSharp#2612 * Fix handling gif encoding for global palettes - Main by @JimBobSquarePants in SixLabors/ImageSharp#2615 * Bump actions/setup-dotnet from 3 to 4 by @dependabot[bot] in SixLabors/ImageSharp#2613 * Adjusted the casing of the Webp format name by @jscarle in SixLabors/ImageSharp#2623 * Fix Paeth Filter decode on platforms that do not support Ssse3 - Main by @JimBobSquarePants in SixLabors/ImageSharp#2620 * Fix WebP animation speed bug by @marklagendijk in SixLabors/ImageSharp#2624 * Promote PixelTypeInfo to Pixel by @stefannikolei in SixLabors/ImageSharp#2601 * TGA: Treat 32 bit True Color images always as transparent by @brianpopow in SixLabors/ImageSharp#2643 * Modernize and optimize pixel format operations across platforms. by @JimBobSquarePants in SixLabors/ImageSharp#2645 * Cleanup SimdUtils by @JimBobSquarePants in SixLabors/ImageSharp#2654 * Bump actions/cache from 3 to 4 by @dependabot[bot] in SixLabors/ImageSharp#2648 * Bump codecov/codecov-action from 3 to 4 by @dependabot[bot] in SixLabors/ImageSharp#2657 * Bump NuGet/setup-nuget from 1 to 2 by @dependabot[bot] in SixLabors/ImageSharp#2658 * Add v3.1.x fixes #2673 and #2674 into main. by @JimBobSquarePants in SixLabors/ImageSharp#2675 * Add fixes 2668, 2676, and 2677 to main by @JimBobSquarePants in SixLabors/ImageSharp#2678 * Merge 2681 to v4 Main by @JimBobSquarePants in SixLabors/ImageSharp#2690 * Add JPEG COM marker support by @RobertMut in SixLabors/ImageSharp#2641 * Bump actions/upload-artifact from 3 to 4 by @dependabot[bot] in SixLabors/ImageSharp#2625 * Only exit JPEG scan decoding after multiple EOF hits by @JimBobSquarePants in SixLabors/ImageSharp#2701 * V4 Ensure VP8X alpha flag is updated correctly. by @JimBobSquarePants in SixLabors/ImageSharp#2703 * Fix animated png handling (issue #2708) by @SpaceCheetah in SixLabors/ImageSharp#2710 * Merge latest release from v3 by @JimBobSquarePants in SixLabors/ImageSharp#2720 * Fix MacOS jobs by @antonfirsov in SixLabors/ImageSharp#2728 * Fix async-over-sync issue in Image.DecodeAsync() by @kroymann in SixLabors/ImageSharp#2725 * Fix overflow in MemoryAllocator.Create(options) by @antonfirsov in SixLabors/ImageSharp#2730 * GifDecoder: Limit lzw bits to a maximum of 12 bits by @brianpopow in SixLabors/ImageSharp#2744 * GifDecoder : Allow skipping bad metadata using identify by @JimBobSquarePants in SixLabors/ImageSharp#2749 * Add ICO and CUR file decoder. by @frg2089 in SixLabors/ImageSharp#2579 * v4 - Fix off-by-one error when centering a transform. by @JimBobSquarePants in SixLabors/ImageSharp#2761 * v4 Fix 2758 by @JimBobSquarePants in SixLabors/ImageSharp#2764 * Simplify Color Space Conversion APIs by @JimBobSquarePants in SixLabors/ImageSharp#2739 * Webp: Fix Issue 2763 by @brianpopow in SixLabors/ImageSharp#2767 * V4 Correctly break during Png decoding by @JimBobSquarePants in SixLabors/ImageSharp#2773 * V4 : Fix filtering on PNG encode. by @JimBobSquarePants in SixLabors/ImageSharp#2778 * Fix #2779 buffer overrun by @KirillAldashkin in SixLabors/ImageSharp#2780 * Fix ImageMetadata docs typo by @lofcz in SixLabors/ImageSharp#2781 * Add API for metadata conversion between formats. by @JimBobSquarePants in SixLabors/ImageSharp#2751 * Tiff decoder: Fix issue 2679 by @brianpopow in SixLabors/ImageSharp#2789 * Replace PngCrcChunkHandling by @JimBobSquarePants in SixLabors/ImageSharp#2786 * Add tagname to debugger visualization for Exif- and Iptc-values, to facilitate easier debugging and discovery by @lassevk in SixLabors/ImageSharp#2787 * V4 - Correctly handle transform spaces when building transform matrices. by @JimBobSquarePants in SixLabors/ImageSharp#2795 * Allow decoding Tiff of different frame size. by @JimBobSquarePants in SixLabors/ImageSharp#2788 * Add progressive JPEG encoder by @ardabada in SixLabors/ImageSharp#2740 * Fix using dither in BmpEncoder when bit per pixel is <= 4 by @mistoll in SixLabors/ImageSharp#2819 * Add QuadDistortion to ProjectiveTransformBuilder by @Socolin in SixLabors/ImageSharp#2748 * WEBP : Use Correct Width With AlphaDecoder by @JimBobSquarePants in SixLabors/ImageSharp#2823 ... (truncated) ## 3.1.12 ## What's Changed * v3 : Add Full Metadata Parsing for WEBP Animations by @JimBobSquarePants in SixLabors/ImageSharp#3002 * V3: Prevent negative allocation attempt for huge TIFF files by @JimBobSquarePants in SixLabors/ImageSharp#3004 * Backport v3 : Tiff decoder: Fix issue 2679 by @JimBobSquarePants in SixLabors/ImageSharp#3007 **Full Changelog**: SixLabors/ImageSharp@v3.1.11...v3.1.12 ## 3.1.11 ## What's Changed * Backport V3 - GIF: Check for end of stream when reading comments. by @JimBobSquarePants in SixLabors/ImageSharp#2955 **Full Changelog**: SixLabors/ImageSharp@v3.1.10...v3.1.11 ## 3.1.10 ## What's Changed * V3: Remove ExifTagValue.InteroperabilityIndex by @JimBobSquarePants in SixLabors/ImageSharp#2939 * V3 TIFF : Allow additional and undefined extra samples by @JimBobSquarePants in SixLabors/ImageSharp#2942 * V3 Use EXIF byte order for EXIF encoded strings. by @JimBobSquarePants in SixLabors/ImageSharp#2944 * V3 Backport : Reduce the number of memory allocations in lossless WebP encoder by @JimBobSquarePants in SixLabors/ImageSharp#2947 **Full Changelog**: SixLabors/ImageSharp@v3.1.9...v3.1.10 ## 3.1.9 ## What's Changed * V3: Do not attempt to decode iDAT chunks when image is fully decoded. by @JimBobSquarePants in SixLabors/ImageSharp#2927 * V3 - Do not throw exception for non-required chunks. by @JimBobSquarePants in SixLabors/ImageSharp#2929 * V3: Do not encode WEBP images exceeding max dimensions by @JimBobSquarePants in SixLabors/ImageSharp#2931 **Full Changelog**: SixLabors/ImageSharp@v3.1.8...v3.1.9 ## 3.1.8 ## What's Changed * V3 : Fix GIF, PNG, and WEBP Edge Case Handling by @JimBobSquarePants in SixLabors/ImageSharp#2882 * V3 Nested sub ifds parsing fix by @JimBobSquarePants in SixLabors/ImageSharp#2913 * V3: Undo horizontal prediction for each tile row in case of tiled tiff's by @JimBobSquarePants in SixLabors/ImageSharp#2914 * V3 - Use BPP from Color Writer for Compressor by @JimBobSquarePants in SixLabors/ImageSharp#2915 **Full Changelog**: SixLabors/ImageSharp@v3.1.7...v3.1.8 ## 3.1.7 ## What's Changed * V3 : Decode Chunky Tile Rows Directly. by @JimBobSquarePants in SixLabors/ImageSharp#2874 * V3: Gracefully handle LZW overflows by @JimBobSquarePants in SixLabors/ImageSharp#2880 * [3.1] Set LangVersion=12 unconditionally by @antonfirsov in SixLabors/ImageSharp#2896 **Full Changelog**: SixLabors/ImageSharp@v3.1.6...v3.1.7 ## 3.1.6 ## What's Changed * Mono AOT decoder workaround for slow jpeg decoding. by @JimBobSquarePants in SixLabors/ImageSharp#2762 * V3 - Correctly handle transform spaces when building transform matrices. by @JimBobSquarePants in SixLabors/ImageSharp#2791 * Backport : V3 Fix #2779 buffer overrun by @JimBobSquarePants in SixLabors/ImageSharp#2824 * Backport - v3 WEBP : Use Correct Width With AlphaDecoder by @JimBobSquarePants in SixLabors/ImageSharp#2827 * Rewrite ChunkedMemoryStream by @JimBobSquarePants in SixLabors/ImageSharp#2828 **Full Changelog**: SixLabors/ImageSharp@v3.1.5...v3.1.6 ## 3.1.5 ## What's Changed * [3.1] Fix overflow in MemoryAllocator.Create(options) by @antonfirsov in SixLabors/ImageSharp#2731 * v3 - Backport. Handle out of bounds Gif LZW max code by @JimBobSquarePants in SixLabors/ImageSharp#2754 * Fix off-by-one error when centering a transform. by @JimBobSquarePants in SixLabors/ImageSharp#2760 * v3.1.x Fix 2758 by @JimBobSquarePants in SixLabors/ImageSharp#2759 * v3.1.x - Backport Webp: Fix Issue 2763/2692 by @JimBobSquarePants in SixLabors/ImageSharp#2768 * Correctly break during Png decoding by @JimBobSquarePants in SixLabors/ImageSharp#2769 * Fix filtering on PNG encode. by @JimBobSquarePants in SixLabors/ImageSharp#2775 **Full Changelog**: SixLabors/ImageSharp@v3.1.4...v3.1.5 ## 3.1.4 ## What's Changed * Backport - Only exit JPEG scan decoding after multiple EOF hits by @JimBobSquarePants in SixLabors/ImageSharp#2702 * Ensure VP8X alpha flag is updated correctly. by @JimBobSquarePants in SixLabors/ImageSharp#2699 * Backport APNG fix to release/3.1.x by @SpaceCheetah in SixLabors/ImageSharp#2713 * Limit Read Palette Indices by @JimBobSquarePants in SixLabors/ImageSharp#2718 * Limit all memory allocations in the MemoryAllocator layer by @antonfirsov in SixLabors/ImageSharp#2706 * Clear Pixel Buffers on Decode. by @JimBobSquarePants in SixLabors/ImageSharp#2716 **Full Changelog**: SixLabors/ImageSharp@v3.1.3...v3.1.4 ## 3.1.3 ## What's Changed * Make DrawImage processor more robust to bad input. by @JimBobSquarePants in SixLabors/ImageSharp#2673 * Don't skip reading data for animation chunks on identify. by @JimBobSquarePants in SixLabors/ImageSharp#2674 * Fix AccessViolationException and hard crash with animated webp by @JimBobSquarePants in SixLabors/ImageSharp#2676 * Use a smarter approach to determine the transparent index when encoding palette Pngs. by @JimBobSquarePants in SixLabors/ImageSharp#2677 * Limit ancillary PNG chunk size. by @JimBobSquarePants in SixLabors/ImageSharp#2681 **Full Changelog**: SixLabors/ImageSharp@v3.1.2...v3.1.3 ## 3.1.2 ## What's Changed * Fix Paeth Filter decode on platforms that do not support Ssse3 by @JimBobSquarePants in SixLabors/ImageSharp#2618 * Backport: Fix WebP animation speed bug by @JimBobSquarePants in SixLabors/ImageSharp#2637 **Full Changelog**: SixLabors/ImageSharp@v3.1.1...v3.1.2 ## 3.1.1 ## What's Changed * Handle dedup of local palette of 256 length by @JimBobSquarePants in SixLabors/ImageSharp#2605 * Correctly calculate foreground Rectangle when negative background location is set (3.1 fix) by @tocsoft in SixLabors/ImageSharp#2609 * Handle case when Foreground image overhangs bottom of background image during DrawImage Call (3.1 target) by @tocsoft in SixLabors/ImageSharp#2610 * Fix handling gif encoding for global palettes. by @JimBobSquarePants in SixLabors/ImageSharp#2614 **Full Changelog**: SixLabors/ImageSharp@v3.1.0...v3.1.1 ## 3.1.0 ## What's Changed * Reduced intermediate allocations by @gfoidl in SixLabors/ImageSharp#2415 * Port colorconverter YCbCr and YCCk to arm by @stefannikolei in SixLabors/ImageSharp#2417 * Added and used Numerics.Vector{128|256}Count extension by @gfoidl in SixLabors/ImageSharp#2422 * Improvements around `fixed` by @gfoidl in SixLabors/ImageSharp#2418 * Create vector constants inline and not via ROS<byte> by @gfoidl in SixLabors/ImageSharp#2419 * More tests for Webp lossless utils by @brianpopow in SixLabors/ImageSharp#2424 * Fix incorrect comments by @hey-red in SixLabors/ImageSharp#2426 * Fixed invalid jpeg buffer width compliment for scalar color converters by @br3aker in SixLabors/ImageSharp#2427 * Update Readme by @brianpopow in SixLabors/ImageSharp#2433 * Add AdvSimd in ComponentProcessor by @stefannikolei in SixLabors/ImageSharp#2429 * Fix decoding tiled tiff with unequal tile width and height by @brianpopow in SixLabors/ImageSharp#2436 * Fix Vp8Residual costs calculation by @brianpopow in SixLabors/ImageSharp#2432 * Fix thresholds for Resize kernel tests by @brianpopow in SixLabors/ImageSharp#2440 * Tiff: Undo horizontal predictor for cmyk images by @brianpopow in SixLabors/ImageSharp#2459 * fix a typo in XML comment for struct `Rgb48` by @n0099 in SixLabors/ImageSharp#2463 * Fix #2467 bmp encoding issue for BMP with 1 bit per pixel and more pixels per row than divisible by 8. by @synercoder in SixLabors/ImageSharp#2471 * Update Directory.Build.targets by @Pashkinz92 in SixLabors/ImageSharp#2468 * bugfix in Rational.cs, when both Nominator and Denominator equals to 0 by @tsardaryanCamenAI in SixLabors/ImageSharp#2453 * Fix DrawImage offsetting issues and improve API parameter names. by @JimBobSquarePants in SixLabors/ImageSharp#2474 * Use more accurate bit for alpha lookup. by @JimBobSquarePants in SixLabors/ImageSharp#2473 * Fix for B&W pbm images with width not dividable by 8 by @ynse01 in SixLabors/ImageSharp#2481 * Tiff: ccitt compression, fix for issue #2451 by @brianpopow in SixLabors/ImageSharp#2483 * Use `FileOptions.Asynchronous` when doing async IO by @Neme12 in SixLabors/ImageSharp#2488 * Allow JFXX as an App0 marker header by @JimBobSquarePants in SixLabors/ImageSharp#2482 * Adding QOI support by @LuisAlfredo92 in SixLabors/ImageSharp#2446 * Vectorize TrimTransparentPixels in GifEncoderCore by @gfoidl in SixLabors/ImageSharp#2500 * Prevent crafted DOS attack. by @JimBobSquarePants in SixLabors/ImageSharp#2501 * Reverse automatic include behavior. by @JimBobSquarePants in SixLabors/ImageSharp#2515 * Handle EOF in Jpeg bit reader when data is bad to prevent DOS attack.… by @JimBobSquarePants in SixLabors/ImageSharp#2523 * Fix #2518 by @antonfirsov in SixLabors/ImageSharp#2519 * Fix for issue 2504 - IPTC and ICC profile information being lost during TIFF file save by @JeffP134 in SixLabors/ImageSharp#2535 * Preserve Gif color palettes and deduplicate frame pixels. by @JimBobSquarePants in SixLabors/ImageSharp#2455 * Bump actions/checkout from 3 to 4 by @dependabot in SixLabors/ImageSharp#2530 * Expose and conserve the color palette for indexed png images. by @JimBobSquarePants in SixLabors/ImageSharp#2485 * Change ExifTag TimeZoneOffset to Signed Short by @Cheesebaron in SixLabors/ImageSharp#2541 * Expose non-nullable configuration to remove AOT limiting null check by @JimBobSquarePants in SixLabors/ImageSharp#2514 * Add GPSHPositioningError exif tag by @Cheesebaron in SixLabors/ImageSharp#2543 * Disallow allocation attempts of unrepresentable sizes by @antonfirsov in SixLabors/ImageSharp#2545 * Add webp decoder option to handle the background color in ANIM chunk by @brianpopow in SixLabors/ImageSharp#2547 * Tiff decoding robustness improvements by @JimBobSquarePants in SixLabors/ImageSharp#2550 * PBM decoder robustness improvements and BufferedReadStream observability by @antonfirsov in SixLabors/ImageSharp#2551 * Follow up on post-merge discussions in #2551 by @antonfirsov in SixLabors/ImageSharp#2552 * APNG support by @Poker-sang in SixLabors/ImageSharp#2511 * WebP - Reduce the allocations in lossless encoding by @JimBobSquarePants in SixLabors/ImageSharp#2546 * Animated webp encoder by @Poker-sang in SixLabors/ImageSharp#2569 * Fix boxed quantization and update refs by @JimBobSquarePants in SixLabors/ImageSharp#2582 * Explicitly set BitsPerPixel and BitsPerSample to 1 for bicolor compressed images by @brianpopow in SixLabors/ImageSharp#2590 * [fix]: Fixed Unknown App0 Marker add profileResolver missing by @JoseEliasSantos in SixLabors/ImageSharp#2566 * Png- Do not attempt to read data for chunks of length 0. by @JimBobSquarePants in SixLabors/ImageSharp#2561 ... (truncated) ## 3.0.2 ## What's Changed * Handle EOF in Jpeg bit reader when data is bad to prevent DOS attack. by @JimBobSquarePants in SixLabors/ImageSharp#2516 **Full Changelog**: SixLabors/ImageSharp@v3.0.1...v3.0.2 ## 3.0.1 ## What's Changed * ISSUE #2385 - Implementing try get pattern to TryFindFormatByFileExtension(string extension, [NotNullWhen(true)] out IImageFormat? format) by @Ollie-Ave in SixLabors/ImageSharp#2386 * Remove mac specific skips by @stefannikolei in SixLabors/ImageSharp#2384 * Add Arm intrinsics to JpegColorConverter RGB by @stefannikolei in SixLabors/ImageSharp#2397 * Add arm64 intrinsics for cmyk converter by @stefannikolei in SixLabors/ImageSharp#2400 * Low-hanging fruit codegen optimizations by @gfoidl in SixLabors/ImageSharp#2401 * Webp: Dont use using statement for encodedAlphaData by @brianpopow in SixLabors/ImageSharp#2412 * Fixed wrong division hack by @gfoidl in SixLabors/ImageSharp#2413 * Port GrayscalConverter to Arm by @stefannikolei in SixLabors/ImageSharp#2409 * Fix RgbScalar by @stefannikolei in SixLabors/ImageSharp#2416 ## New Contributors * @Ollie-Ave made their first contribution in SixLabors/ImageSharp#2386 **Full Changelog**: SixLabors/ImageSharp@v3.0.0...v3.0.1 ## 3.0.0 ## What's Changed * Use .NET 6 only by @JimBobSquarePants in SixLabors/ImageSharp#2098 * Convolution: Border wrapping modes by @ynse01 in SixLabors/ImageSharp#2060 * Use ReadOnlySpan<byte> static data compiler optimization in more places by @turbedi in SixLabors/ImageSharp#2101 * Add support for decoding jpeg's with arithmetic coding by @brianpopow in SixLabors/ImageSharp#2073 * Replace Array.Clear(array, 0, array.Length) calls with Array.Clear(array) by @turbedi in SixLabors/ImageSharp#2103 * Preserve color profile when encoding bitmaps by @brianpopow in SixLabors/ImageSharp#2108 * Preserve color profile when encoding webp images by @brianpopow in SixLabors/ImageSharp#2109 * Preserve color profile when encoding PNG images by @brianpopow in SixLabors/ImageSharp#2110 * Add support for decoding webp images with animations by @brianpopow in SixLabors/ImageSharp#1985 * Jpeg compressed tiff: jpeg decoder should handle the conversion from YCbCr to RGB by @brianpopow in SixLabors/ImageSharp#2124 * Deduce color space as YCbCr if component id's are 1, 2, 3 by @brianpopow in SixLabors/ImageSharp#2135 * Bump actions/checkout from 2 to 3 by @dependabot in SixLabors/ImageSharp#2145 * Bump actions/setup-dotnet from 1 to 2 by @dependabot in SixLabors/ImageSharp#2143 * Bump actions/cache from 2 to 3 by @dependabot in SixLabors/ImageSharp#2142 * Bump actions/upload-artifact from 2 to 3 by @dependabot in SixLabors/ImageSharp#2146 * Bump codecov/codecov-action from 1 to 3 by @dependabot in SixLabors/ImageSharp#2144 * Skip invalid markers during jpeg decoding by @br3aker in SixLabors/ImageSharp#2147 * Tiff: Performance improvements for Fax4 decompression by @brianpopow in SixLabors/ImageSharp#2134 * Fix regression in TIF image loading by @brianpopow in SixLabors/ImageSharp#2150 * Used inline SIMD vectors if they are constants by @gfoidl in SixLabors/ImageSharp#2122 * Print environment info on tests start by @JimBobSquarePants in SixLabors/ImageSharp#2175 * Update License by @JimBobSquarePants in SixLabors/ImageSharp#2176 * Jpeg downscaling decoding by @br3aker in SixLabors/ImageSharp#2076 * Add support for decoding tiff images with CieLab color space by @brianpopow in SixLabors/ImageSharp#2127 * Assembly Trimming Support by @ds5678 in SixLabors/ImageSharp#2160 * Jpeg color space deduction fix by @br3aker in SixLabors/ImageSharp#2177 * Add support for decoding tiff with webp compressed data by @brianpopow in SixLabors/ImageSharp#2128 * Fix issue when writing lossy webp with alpha data by @brianpopow in SixLabors/ImageSharp#2173 * Fix run-length encode compression implementation mistake in tga encoder by @l1nxy in SixLabors/ImageSharp#2172 * TGA Encoder/Decoder Improvements by @brianpopow in SixLabors/ImageSharp#2197 * Tiff: Make sure 1 Bit compression is only used with 1 bit pixel type by @brianpopow in SixLabors/ImageSharp#2201 * Refactor `EnumUtils` and make it AOT-friendly. by @teo-tsirpanis in SixLabors/ImageSharp#2200 * Jpeg encoder complete rewrite by @br3aker in SixLabors/ImageSharp#2120 * Fix IPTC tags written on jpg files that contains non-English characters can't be correctly displayed on external apps #2212 by @lmerino-ep in SixLabors/ImageSharp#2213 * Identify transparency for indexed PNG correctly by @brianpopow in SixLabors/ImageSharp#2215 * Introduce Shared General Decoder Options plus Specialization by @JimBobSquarePants in SixLabors/ImageSharp#2180 * Add option to encode 2-bit Bitmap's by @brianpopow in SixLabors/ImageSharp#2220 * Fix AdaptiveThresholdProcessor throws IndexOutOfRangeException by @brianpopow in SixLabors/ImageSharp#2221 * Relaxed bmp dimensions validation by @smorokin in SixLabors/ImageSharp#2192 * Remove obsolete code by @JimBobSquarePants in SixLabors/ImageSharp#2189 * Implement Median Blur processor by @ynse01 in SixLabors/ImageSharp#2219 * Make TestFile Image threadsafe. by @JimBobSquarePants in SixLabors/ImageSharp#2225 * PNG filter improvements by @saucecontrol in SixLabors/ImageSharp#2226 * Use File-Scoped Namespaces and Global Implicit Usings by @JimBobSquarePants in SixLabors/ImageSharp#2229 * Fix for issue #2117 by @brianpopow in SixLabors/ImageSharp#2230 * Use System.Half for HalfTypeHelper by @JimBobSquarePants in SixLabors/ImageSharp#2233 * [Chore] Remove InlineningOption from ThrowHelpers by @blouflashdb in SixLabors/ImageSharp#2234 * Implement AutoLevel processor - Attempt 2 by @ynse01 in SixLabors/ImageSharp#2235 * Add TryGetLinearlySeparableComponents and tests by @JimBobSquarePants in SixLabors/ImageSharp#2224 ... (truncated) ## 2.1.13 ## What's Changed * V2 backport: 2243 - Ignore unknown chunks for WEBP by @sonbua in SixLabors/ImageSharp#2505 ## New Contributors * @sonbua made their first contribution in SixLabors/ImageSharp#2505 **Full Changelog**: SixLabors/ImageSharp@v2.1.12...v2.1.13 ## 2.1.12 ## What's Changed * Backport #2926 to release/2.1.x by @mus65 in SixLabors/ImageSharp#2985 ## New Contributors * @mus65 made their first contribution in SixLabors/ImageSharp#2985 **Full Changelog**: SixLabors/ImageSharp@v2.1.11...v2.1.12 ## 2.1.11 ## What's Changed * Backport V2 - GIF: Check for end of stream when reading comments. by @JimBobSquarePants in SixLabors/ImageSharp#2971 **Full Changelog**: SixLabors/ImageSharp@v2.1.10...v2.1.11 ## 2.1.10 ## What's Changed * Backport #2859 to release/2.1.x by @antonfirsov in SixLabors/ImageSharp#2890 * Backport #2701 to 2.1.x [copy] by @antonfirsov in SixLabors/ImageSharp#2891 **Full Changelog**: SixLabors/ImageSharp@v2.1.9...v2.1.10 Commits viewable in [compare view](SixLabors/ImageSharp@v2.1.9...v4.1.2). </details> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=SixLabors.ImageSharp&package-manager=nuget&previous-version=2.1.9&new-version=4.1.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/microsoft/onnxruntime/network/alerts). </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Add progressive JPEG encoder

a059f4e

Merge branch 'main' into progressive-jpeg-encoder

602504e

ardabada added 2 commits May 22, 2024 23:31

update write block in huffman encoder, add test

490c0d3

update jpeg encoder core

dc5affa

Merge branch 'main' into progressive-jpeg-encoder

f0c3ec6

JimBobSquarePants added enhancement formats:jpeg labels Jun 13, 2024

JimBobSquarePants and others added 5 commits July 1, 2024 09:45

Merge branch 'main' into progressive-jpeg-encoder

2d548d0

Merge branch 'main' into progressive-jpeg-encoder

53d776d

Add restart interval

f131d60

fix build (maybe)

3f81572

Merge branch 'main' into progressive-jpeg-encoder

1349409

JimBobSquarePants reviewed Jul 12, 2024

View reviewed changes

JimBobSquarePants added 3 commits July 16, 2024 12:28

Merge branch 'main' into progressive-jpeg-encoder

9df2631

Merge branch 'main' into progressive-jpeg-encoder

dbd03a3

Merge branch 'main' into progressive-jpeg-encoder

aa77441

ardabada added 3 commits October 8, 2024 18:15

Update encoder and decoder to handle restart interval

a34bca3

merge

3b46ce1

fix

4ff51b9

JimBobSquarePants approved these changes Oct 12, 2024

View reviewed changes

This was referenced Oct 8, 2026

Bump SixLabors.ImageSharp from 3.1.12 to 4.1.2 1303106965/Feor1n#1

Open

Bump SixLabors.ImageSharp from 3.1.12 to 4.1.2 pine-vm/pine#54

Closed

Navigation Menu

Repository navigation

Add progressive JPEG encoder - #2740

Add progressive JPEG encoder#2740
JimBobSquarePants merged 16 commits into
SixLabors:mainfrom
ardabada:progressive-jpeg-encoder

ardabada commented May 21, 2024 •

edited

Loading

Uh oh!

CLAassistant commented May 21, 2024 •

edited

Loading

Uh oh!

JimBobSquarePants commented May 22, 2024

Uh oh!

ardabada commented May 22, 2024

Uh oh!

JimBobSquarePants commented May 30, 2024

Uh oh!

JimBobSquarePants commented Jun 18, 2024

Uh oh!

JimBobSquarePants Jul 12, 2024

Uh oh!

JimBobSquarePants commented Jul 26, 2024 •

edited

Loading

Uh oh!

ardabada commented Aug 2, 2024

Uh oh!

JimBobSquarePants commented Aug 2, 2024

Uh oh!

ardabada commented Oct 8, 2024

Uh oh!

JimBobSquarePants commented Oct 10, 2024

Uh oh!

JimBobSquarePants left a comment

Uh oh!

JimBobSquarePants Oct 12, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

ardabada commented May 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Prerequisites

Description

Uh oh!

CLAassistant commented May 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JimBobSquarePants commented May 22, 2024

Uh oh!

ardabada commented May 22, 2024

Uh oh!

JimBobSquarePants commented May 30, 2024

Uh oh!

JimBobSquarePants commented Jun 18, 2024

Uh oh!

JimBobSquarePants Jul 12, 2024

Choose a reason for hiding this comment

Uh oh!

JimBobSquarePants commented Jul 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ardabada commented Aug 2, 2024

Uh oh!

JimBobSquarePants commented Aug 2, 2024

Uh oh!

ardabada commented Oct 8, 2024

Uh oh!

JimBobSquarePants commented Oct 10, 2024

Uh oh!

JimBobSquarePants left a comment

Choose a reason for hiding this comment

Uh oh!

JimBobSquarePants Oct 12, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ardabada commented May 21, 2024 •

edited

Loading

CLAassistant commented May 21, 2024 •

edited

Loading

JimBobSquarePants commented Jul 26, 2024 •

edited

Loading