Merge pull request #1961 from SixLabors/bp/webplossydefault

Webp encoder now defaults to lossy, if nothing else is specified
SixLabors · Jan 26, 2022 · f15bc74 · f15bc74
2 parents ffa35c3 + ebf8b44
commit f15bc74
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/src/ImageSharp/Formats/Webp/IWebpEncoderOptions.cs b/src/ImageSharp/Formats/Webp/IWebpEncoderOptions.cs
@@ -10,6 +10,7 @@ internal interface IWebpEncoderOptions
     {
         /// <summary>
         /// Gets the webp file format used. Either lossless or lossy.
+        /// Defaults to lossy.
         /// </summary>
         WebpFileFormatType? FileFormat { get; }
 

diff --git a/src/ImageSharp/Formats/Webp/WebpEncoderCore.cs b/src/ImageSharp/Formats/Webp/WebpEncoderCore.cs
@@ -70,6 +70,7 @@ internal sealed class WebpEncoderCore : IImageEncoderInternals
 
         /// <summary>
         /// Indicating what file format compression should be used.
+        /// Defaults to lossy.
         /// </summary>
         private readonly WebpFileFormatType? fileFormat;
 
@@ -112,43 +113,43 @@ public void Encode<TPixel>(Image<TPixel> image, Stream stream, CancellationToken
             Guard.NotNull(stream, nameof(stream));
 
             this.configuration = image.GetConfiguration();
-            bool lossy;
+            bool lossless;
             if (this.fileFormat is not null)
             {
-                lossy = this.fileFormat == WebpFileFormatType.Lossy;
+                lossless = this.fileFormat == WebpFileFormatType.Lossless;
             }
             else
             {
                 WebpMetadata webpMetadata = image.Metadata.GetWebpMetadata();
-                lossy = webpMetadata.FileFormat == WebpFileFormatType.Lossy;
+                lossless = webpMetadata.FileFormat == WebpFileFormatType.Lossless;
             }
 
-            if (lossy)
+            if (lossless)
             {
-                using var enc = new Vp8Encoder(
+                using var enc = new Vp8LEncoder(
                     this.memoryAllocator,
                     this.configuration,
                     image.Width,
                     image.Height,
                     this.quality,
                     this.method,
-                    this.entropyPasses,
-                    this.filterStrength,
-                    this.spatialNoiseShaping);
+                    this.transparentColorMode,
+                    this.nearLossless,
+                    this.nearLosslessQuality);
                 enc.Encode(image, stream);
             }
             else
             {
-                using var enc = new Vp8LEncoder(
+                using var enc = new Vp8Encoder(
                     this.memoryAllocator,
                     this.configuration,
                     image.Width,
                     image.Height,
                     this.quality,
                     this.method,
-                    this.transparentColorMode,
-                    this.nearLossless,
-                    this.nearLosslessQuality);
+                    this.entropyPasses,
+                    this.filterStrength,
+                    this.spatialNoiseShaping);
                 enc.Encode(image, stream);
             }
         }

diff --git a/tests/ImageSharp.Tests/Formats/WebP/WebpEncoderTests.cs b/tests/ImageSharp.Tests/Formats/WebP/WebpEncoderTests.cs
@@ -18,7 +18,7 @@ public class WebpEncoderTests
         private static string TestImageLossyFullPath => Path.Combine(TestEnvironment.InputImagesDirectoryFullPath, Lossy.NoFilter06);
 
         [Theory]
-        [WithFile(Flag, PixelTypes.Rgba32, WebpFileFormatType.Lossless)] // if its not a webp input image, it should default to lossless.
+        [WithFile(Flag, PixelTypes.Rgba32, WebpFileFormatType.Lossy)] // If its not a webp input image, it should default to lossy.
         [WithFile(Lossless.NoTransform1, PixelTypes.Rgba32, WebpFileFormatType.Lossless)]
         [WithFile(Lossy.Bike, PixelTypes.Rgba32, WebpFileFormatType.Lossy)]
         public void Encode_PreserveRatio<TPixel>(TestImageProvider<TPixel> provider, WebpFileFormatType expectedFormat)