|
|
@ -1,6 +1,5 @@ |
|
|
// Copyright (c) Six Labors.
|
|
|
// Copyright (c) Six Labors.
|
|
|
// Licensed under the Six Labors Split License.
|
|
|
// Licensed under the Six Labors Split License.
|
|
|
#nullable disable |
|
|
|
|
|
|
|
|
|
|
|
using System.Buffers; |
|
|
using System.Buffers; |
|
|
using System.Buffers.Binary; |
|
|
using System.Buffers.Binary; |
|
|
@ -9,9 +8,7 @@ using SixLabors.ImageSharp.Formats.Webp.Lossy; |
|
|
using SixLabors.ImageSharp.IO; |
|
|
using SixLabors.ImageSharp.IO; |
|
|
using SixLabors.ImageSharp.Memory; |
|
|
using SixLabors.ImageSharp.Memory; |
|
|
using SixLabors.ImageSharp.Metadata; |
|
|
using SixLabors.ImageSharp.Metadata; |
|
|
using SixLabors.ImageSharp.Metadata.Profiles.Exif; |
|
|
|
|
|
using SixLabors.ImageSharp.Metadata.Profiles.Icc; |
|
|
using SixLabors.ImageSharp.Metadata.Profiles.Icc; |
|
|
using SixLabors.ImageSharp.Metadata.Profiles.Xmp; |
|
|
|
|
|
using SixLabors.ImageSharp.PixelFormats; |
|
|
using SixLabors.ImageSharp.PixelFormats; |
|
|
|
|
|
|
|
|
namespace SixLabors.ImageSharp.Formats.Webp; |
|
|
namespace SixLabors.ImageSharp.Formats.Webp; |
|
|
@ -41,35 +38,20 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
private readonly uint maxFrames; |
|
|
private readonly uint maxFrames; |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Gets the <see cref="ImageMetadata"/> decoded by this decoder instance.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
private ImageMetadata metadata; |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Gets or sets the alpha data, if an ALPH chunk is present.
|
|
|
/// Gets or sets the alpha data, if an ALPH chunk is present.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
private IMemoryOwner<byte> alphaData; |
|
|
private IMemoryOwner<byte>? alphaData; |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Used for allocating memory during the decoding operations.
|
|
|
/// Used for allocating memory during the decoding operations.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
private readonly MemoryAllocator memoryAllocator; |
|
|
private readonly MemoryAllocator memoryAllocator; |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// The stream to decode from.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
private BufferedReadStream currentStream; |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// The webp specific metadata.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
private WebpMetadata webpMetadata; |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Information about the webp image.
|
|
|
/// Information about the webp image.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
private WebpImageInfo webImageInfo; |
|
|
private WebpImageInfo? webImageInfo; |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Initializes a new instance of the <see cref="WebpDecoderCore"/> class.
|
|
|
/// Initializes a new instance of the <see cref="WebpDecoderCore"/> class.
|
|
|
@ -88,25 +70,24 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
public DecoderOptions Options { get; } |
|
|
public DecoderOptions Options { get; } |
|
|
|
|
|
|
|
|
/// <inheritdoc/>
|
|
|
/// <inheritdoc/>
|
|
|
public Size Dimensions => new((int)this.webImageInfo.Width, (int)this.webImageInfo.Height); |
|
|
public Size Dimensions => new((int)this.webImageInfo!.Width, (int)this.webImageInfo.Height); |
|
|
|
|
|
|
|
|
/// <inheritdoc />
|
|
|
/// <inheritdoc />
|
|
|
public Image<TPixel> Decode<TPixel>(BufferedReadStream stream, CancellationToken cancellationToken) |
|
|
public Image<TPixel> Decode<TPixel>(BufferedReadStream stream, CancellationToken cancellationToken) |
|
|
where TPixel : unmanaged, IPixel<TPixel> |
|
|
where TPixel : unmanaged, IPixel<TPixel> |
|
|
{ |
|
|
{ |
|
|
Image<TPixel> image = null; |
|
|
Image<TPixel>? image = null; |
|
|
try |
|
|
try |
|
|
{ |
|
|
{ |
|
|
this.metadata = new ImageMetadata(); |
|
|
ImageMetadata metadata = new(); |
|
|
this.currentStream = stream; |
|
|
|
|
|
|
|
|
|
|
|
uint fileSize = this.ReadImageHeader(); |
|
|
uint fileSize = this.ReadImageHeader(stream); |
|
|
|
|
|
|
|
|
using (this.webImageInfo = this.ReadVp8Info()) |
|
|
using (this.webImageInfo = this.ReadVp8Info(stream, metadata)) |
|
|
{ |
|
|
{ |
|
|
if (this.webImageInfo.Features is { Animation: true }) |
|
|
if (this.webImageInfo.Features is { Animation: true }) |
|
|
{ |
|
|
{ |
|
|
using var animationDecoder = new WebpAnimationDecoder(this.memoryAllocator, this.configuration, this.maxFrames); |
|
|
using WebpAnimationDecoder animationDecoder = new(this.memoryAllocator, this.configuration, this.maxFrames); |
|
|
return animationDecoder.Decode<TPixel>(stream, this.webImageInfo.Features, this.webImageInfo.Width, this.webImageInfo.Height, fileSize); |
|
|
return animationDecoder.Decode<TPixel>(stream, this.webImageInfo.Features, this.webImageInfo.Width, this.webImageInfo.Height, fileSize); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -115,23 +96,23 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
WebpThrowHelper.ThrowNotSupportedException("Animations are not supported"); |
|
|
WebpThrowHelper.ThrowNotSupportedException("Animations are not supported"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
image = new Image<TPixel>(this.configuration, (int)this.webImageInfo.Width, (int)this.webImageInfo.Height, this.metadata); |
|
|
image = new Image<TPixel>(this.configuration, (int)this.webImageInfo.Width, (int)this.webImageInfo.Height, metadata); |
|
|
Buffer2D<TPixel> pixels = image.GetRootFramePixelBuffer(); |
|
|
Buffer2D<TPixel> pixels = image.GetRootFramePixelBuffer(); |
|
|
if (this.webImageInfo.IsLossless) |
|
|
if (this.webImageInfo.IsLossless) |
|
|
{ |
|
|
{ |
|
|
var losslessDecoder = new WebpLosslessDecoder(this.webImageInfo.Vp8LBitReader, this.memoryAllocator, this.configuration); |
|
|
WebpLosslessDecoder losslessDecoder = new(this.webImageInfo.Vp8LBitReader, this.memoryAllocator, this.configuration); |
|
|
losslessDecoder.Decode(pixels, image.Width, image.Height); |
|
|
losslessDecoder.Decode(pixels, image.Width, image.Height); |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
var lossyDecoder = new WebpLossyDecoder(this.webImageInfo.Vp8BitReader, this.memoryAllocator, this.configuration); |
|
|
WebpLossyDecoder lossyDecoder = new(this.webImageInfo.Vp8BitReader, this.memoryAllocator, this.configuration); |
|
|
lossyDecoder.Decode(pixels, image.Width, image.Height, this.webImageInfo, this.alphaData); |
|
|
lossyDecoder.Decode(pixels, image.Width, image.Height, this.webImageInfo, this.alphaData); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// There can be optional chunks after the image data, like EXIF and XMP.
|
|
|
// There can be optional chunks after the image data, like EXIF and XMP.
|
|
|
if (this.webImageInfo.Features != null) |
|
|
if (this.webImageInfo.Features != null) |
|
|
{ |
|
|
{ |
|
|
this.ParseOptionalChunks(this.webImageInfo.Features); |
|
|
this.ParseOptionalChunks(stream, metadata, this.webImageInfo.Features); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return image; |
|
|
return image; |
|
|
@ -147,31 +128,32 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
/// <inheritdoc />
|
|
|
/// <inheritdoc />
|
|
|
public ImageInfo Identify(BufferedReadStream stream, CancellationToken cancellationToken) |
|
|
public ImageInfo Identify(BufferedReadStream stream, CancellationToken cancellationToken) |
|
|
{ |
|
|
{ |
|
|
this.currentStream = stream; |
|
|
this.ReadImageHeader(stream); |
|
|
|
|
|
|
|
|
this.ReadImageHeader(); |
|
|
ImageMetadata metadata = new(); |
|
|
using (this.webImageInfo = this.ReadVp8Info(true)) |
|
|
using (this.webImageInfo = this.ReadVp8Info(stream, metadata, true)) |
|
|
{ |
|
|
{ |
|
|
return new ImageInfo(new PixelTypeInfo((int)this.webImageInfo.BitsPerPixel), (int)this.webImageInfo.Width, (int)this.webImageInfo.Height, this.metadata); |
|
|
return new ImageInfo(new PixelTypeInfo((int)this.webImageInfo.BitsPerPixel), (int)this.webImageInfo.Width, (int)this.webImageInfo.Height, metadata); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Reads and skips over the image header.
|
|
|
/// Reads and skips over the image header.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="stream">The stream to decode from.</param>
|
|
|
/// <returns>The file size in bytes.</returns>
|
|
|
/// <returns>The file size in bytes.</returns>
|
|
|
private uint ReadImageHeader() |
|
|
private uint ReadImageHeader(BufferedReadStream stream) |
|
|
{ |
|
|
{ |
|
|
// Skip FourCC header, we already know its a RIFF file at this point.
|
|
|
// Skip FourCC header, we already know its a RIFF file at this point.
|
|
|
this.currentStream.Skip(4); |
|
|
stream.Skip(4); |
|
|
|
|
|
|
|
|
// Read file size.
|
|
|
// Read file size.
|
|
|
// The size of the file in bytes starting at offset 8.
|
|
|
// The size of the file in bytes starting at offset 8.
|
|
|
// The file size in the header is the total size of the chunks that follow plus 4 bytes for the ‘WEBP’ FourCC.
|
|
|
// The file size in the header is the total size of the chunks that follow plus 4 bytes for the ‘WEBP’ FourCC.
|
|
|
uint fileSize = WebpChunkParsingUtils.ReadChunkSize(this.currentStream, this.buffer); |
|
|
uint fileSize = WebpChunkParsingUtils.ReadChunkSize(stream, this.buffer); |
|
|
|
|
|
|
|
|
// Skip 'WEBP' from the header.
|
|
|
// Skip 'WEBP' from the header.
|
|
|
this.currentStream.Skip(4); |
|
|
stream.Skip(4); |
|
|
|
|
|
|
|
|
return fileSize; |
|
|
return fileSize; |
|
|
} |
|
|
} |
|
|
@ -179,42 +161,43 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Reads information present in the image header, about the image content and how to decode the image.
|
|
|
/// Reads information present in the image header, about the image content and how to decode the image.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="stream">The stream to decode from.</param>
|
|
|
|
|
|
/// <param name="metadata">The image metadata.</param>
|
|
|
/// <param name="ignoreAlpha">For identify, the alpha data should not be read.</param>
|
|
|
/// <param name="ignoreAlpha">For identify, the alpha data should not be read.</param>
|
|
|
/// <returns>Information about the webp image.</returns>
|
|
|
/// <returns>Information about the webp image.</returns>
|
|
|
private WebpImageInfo ReadVp8Info(bool ignoreAlpha = false) |
|
|
private WebpImageInfo ReadVp8Info(BufferedReadStream stream, ImageMetadata metadata, bool ignoreAlpha = false) |
|
|
{ |
|
|
{ |
|
|
this.metadata = new ImageMetadata(); |
|
|
WebpMetadata webpMetadata = metadata.GetFormatMetadata(WebpFormat.Instance); |
|
|
this.webpMetadata = this.metadata.GetFormatMetadata(WebpFormat.Instance); |
|
|
|
|
|
|
|
|
|
|
|
WebpChunkType chunkType = WebpChunkParsingUtils.ReadChunkType(this.currentStream, this.buffer); |
|
|
WebpChunkType chunkType = WebpChunkParsingUtils.ReadChunkType(stream, this.buffer); |
|
|
|
|
|
|
|
|
var features = new WebpFeatures(); |
|
|
WebpFeatures features = new(); |
|
|
switch (chunkType) |
|
|
switch (chunkType) |
|
|
{ |
|
|
{ |
|
|
case WebpChunkType.Vp8: |
|
|
case WebpChunkType.Vp8: |
|
|
this.webpMetadata.FileFormat = WebpFileFormatType.Lossy; |
|
|
webpMetadata.FileFormat = WebpFileFormatType.Lossy; |
|
|
return WebpChunkParsingUtils.ReadVp8Header(this.memoryAllocator, this.currentStream, this.buffer, features); |
|
|
return WebpChunkParsingUtils.ReadVp8Header(this.memoryAllocator, stream, this.buffer, features); |
|
|
case WebpChunkType.Vp8L: |
|
|
case WebpChunkType.Vp8L: |
|
|
this.webpMetadata.FileFormat = WebpFileFormatType.Lossless; |
|
|
webpMetadata.FileFormat = WebpFileFormatType.Lossless; |
|
|
return WebpChunkParsingUtils.ReadVp8LHeader(this.memoryAllocator, this.currentStream, this.buffer, features); |
|
|
return WebpChunkParsingUtils.ReadVp8LHeader(this.memoryAllocator, stream, this.buffer, features); |
|
|
case WebpChunkType.Vp8X: |
|
|
case WebpChunkType.Vp8X: |
|
|
WebpImageInfo webpInfos = WebpChunkParsingUtils.ReadVp8XHeader(this.currentStream, this.buffer, features); |
|
|
WebpImageInfo webpInfos = WebpChunkParsingUtils.ReadVp8XHeader(stream, this.buffer, features); |
|
|
while (this.currentStream.Position < this.currentStream.Length) |
|
|
while (stream.Position < stream.Length) |
|
|
{ |
|
|
{ |
|
|
chunkType = WebpChunkParsingUtils.ReadChunkType(this.currentStream, this.buffer); |
|
|
chunkType = WebpChunkParsingUtils.ReadChunkType(stream, this.buffer); |
|
|
if (chunkType == WebpChunkType.Vp8) |
|
|
if (chunkType == WebpChunkType.Vp8) |
|
|
{ |
|
|
{ |
|
|
this.webpMetadata.FileFormat = WebpFileFormatType.Lossy; |
|
|
webpMetadata.FileFormat = WebpFileFormatType.Lossy; |
|
|
webpInfos = WebpChunkParsingUtils.ReadVp8Header(this.memoryAllocator, this.currentStream, this.buffer, features); |
|
|
webpInfos = WebpChunkParsingUtils.ReadVp8Header(this.memoryAllocator, stream, this.buffer, features); |
|
|
} |
|
|
} |
|
|
else if (chunkType == WebpChunkType.Vp8L) |
|
|
else if (chunkType == WebpChunkType.Vp8L) |
|
|
{ |
|
|
{ |
|
|
this.webpMetadata.FileFormat = WebpFileFormatType.Lossless; |
|
|
webpMetadata.FileFormat = WebpFileFormatType.Lossless; |
|
|
webpInfos = WebpChunkParsingUtils.ReadVp8LHeader(this.memoryAllocator, this.currentStream, this.buffer, features); |
|
|
webpInfos = WebpChunkParsingUtils.ReadVp8LHeader(this.memoryAllocator, stream, this.buffer, features); |
|
|
} |
|
|
} |
|
|
else if (WebpChunkParsingUtils.IsOptionalVp8XChunk(chunkType)) |
|
|
else if (WebpChunkParsingUtils.IsOptionalVp8XChunk(chunkType)) |
|
|
{ |
|
|
{ |
|
|
bool isAnimationChunk = this.ParseOptionalExtendedChunks(chunkType, features, ignoreAlpha); |
|
|
bool isAnimationChunk = this.ParseOptionalExtendedChunks(stream, metadata, chunkType, features, ignoreAlpha); |
|
|
if (isAnimationChunk) |
|
|
if (isAnimationChunk) |
|
|
{ |
|
|
{ |
|
|
return webpInfos; |
|
|
return webpInfos; |
|
|
@ -223,8 +206,8 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
// Ignore unknown chunks.
|
|
|
// Ignore unknown chunks.
|
|
|
uint chunkSize = this.ReadChunkSize(); |
|
|
uint chunkSize = this.ReadChunkSize(stream); |
|
|
this.currentStream.Skip((int)chunkSize); |
|
|
stream.Skip((int)chunkSize); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -239,32 +222,39 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Parses optional VP8X chunks, which can be ICCP, XMP, ANIM or ALPH chunks.
|
|
|
/// Parses optional VP8X chunks, which can be ICCP, XMP, ANIM or ALPH chunks.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="stream">The stream to decode from.</param>
|
|
|
|
|
|
/// <param name="metadata">The image metadata.</param>
|
|
|
/// <param name="chunkType">The chunk type.</param>
|
|
|
/// <param name="chunkType">The chunk type.</param>
|
|
|
/// <param name="features">The webp image features.</param>
|
|
|
/// <param name="features">The webp image features.</param>
|
|
|
/// <param name="ignoreAlpha">For identify, the alpha data should not be read.</param>
|
|
|
/// <param name="ignoreAlpha">For identify, the alpha data should not be read.</param>
|
|
|
/// <returns>true, if its a alpha chunk.</returns>
|
|
|
/// <returns>true, if its a alpha chunk.</returns>
|
|
|
private bool ParseOptionalExtendedChunks(WebpChunkType chunkType, WebpFeatures features, bool ignoreAlpha) |
|
|
private bool ParseOptionalExtendedChunks( |
|
|
|
|
|
BufferedReadStream stream, |
|
|
|
|
|
ImageMetadata metadata, |
|
|
|
|
|
WebpChunkType chunkType, |
|
|
|
|
|
WebpFeatures features, |
|
|
|
|
|
bool ignoreAlpha) |
|
|
{ |
|
|
{ |
|
|
switch (chunkType) |
|
|
switch (chunkType) |
|
|
{ |
|
|
{ |
|
|
case WebpChunkType.Iccp: |
|
|
case WebpChunkType.Iccp: |
|
|
this.ReadIccProfile(); |
|
|
this.ReadIccProfile(stream, metadata); |
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
case WebpChunkType.Exif: |
|
|
case WebpChunkType.Exif: |
|
|
this.ReadExifProfile(); |
|
|
this.ReadExifProfile(stream, metadata); |
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
case WebpChunkType.Xmp: |
|
|
case WebpChunkType.Xmp: |
|
|
this.ReadXmpProfile(); |
|
|
this.ReadXmpProfile(stream, metadata); |
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
case WebpChunkType.AnimationParameter: |
|
|
case WebpChunkType.AnimationParameter: |
|
|
this.ReadAnimationParameters(features); |
|
|
this.ReadAnimationParameters(stream, features); |
|
|
return true; |
|
|
return true; |
|
|
|
|
|
|
|
|
case WebpChunkType.Alpha: |
|
|
case WebpChunkType.Alpha: |
|
|
this.ReadAlphaData(features, ignoreAlpha); |
|
|
this.ReadAlphaData(stream, features, ignoreAlpha); |
|
|
break; |
|
|
break; |
|
|
default: |
|
|
default: |
|
|
WebpThrowHelper.ThrowImageFormatException("Unexpected chunk followed VP8X header"); |
|
|
WebpThrowHelper.ThrowImageFormatException("Unexpected chunk followed VP8X header"); |
|
|
@ -277,32 +267,34 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Reads the optional metadata EXIF of XMP profiles, which can follow the image data.
|
|
|
/// Reads the optional metadata EXIF of XMP profiles, which can follow the image data.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="stream">The stream to decode from.</param>
|
|
|
|
|
|
/// <param name="metadata">The image metadata.</param>
|
|
|
/// <param name="features">The webp features.</param>
|
|
|
/// <param name="features">The webp features.</param>
|
|
|
private void ParseOptionalChunks(WebpFeatures features) |
|
|
private void ParseOptionalChunks(BufferedReadStream stream, ImageMetadata metadata, WebpFeatures features) |
|
|
{ |
|
|
{ |
|
|
if (this.skipMetadata || (!features.ExifProfile && !features.XmpMetaData)) |
|
|
if (this.skipMetadata || (!features.ExifProfile && !features.XmpMetaData)) |
|
|
{ |
|
|
{ |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
long streamLength = this.currentStream.Length; |
|
|
long streamLength = stream.Length; |
|
|
while (this.currentStream.Position < streamLength) |
|
|
while (stream.Position < streamLength) |
|
|
{ |
|
|
{ |
|
|
// Read chunk header.
|
|
|
// Read chunk header.
|
|
|
WebpChunkType chunkType = this.ReadChunkType(); |
|
|
WebpChunkType chunkType = this.ReadChunkType(stream); |
|
|
if (chunkType == WebpChunkType.Exif && this.metadata.ExifProfile == null) |
|
|
if (chunkType == WebpChunkType.Exif && metadata.ExifProfile == null) |
|
|
{ |
|
|
{ |
|
|
this.ReadExifProfile(); |
|
|
this.ReadExifProfile(stream, metadata); |
|
|
} |
|
|
} |
|
|
else if (chunkType == WebpChunkType.Xmp && this.metadata.XmpProfile == null) |
|
|
else if (chunkType == WebpChunkType.Xmp && metadata.XmpProfile == null) |
|
|
{ |
|
|
{ |
|
|
this.ReadXmpProfile(); |
|
|
this.ReadXmpProfile(stream, metadata); |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
// Skip duplicate XMP or EXIF chunk.
|
|
|
// Skip duplicate XMP or EXIF chunk.
|
|
|
uint chunkLength = this.ReadChunkSize(); |
|
|
uint chunkLength = this.ReadChunkSize(stream); |
|
|
this.currentStream.Skip((int)chunkLength); |
|
|
stream.Skip((int)chunkLength); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -310,76 +302,80 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Reads the EXIF profile from the stream.
|
|
|
/// Reads the EXIF profile from the stream.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
private void ReadExifProfile() |
|
|
/// <param name="stream">The stream to decode from.</param>
|
|
|
|
|
|
/// <param name="metadata">The image metadata.</param>
|
|
|
|
|
|
private void ReadExifProfile(BufferedReadStream stream, ImageMetadata metadata) |
|
|
{ |
|
|
{ |
|
|
uint exifChunkSize = this.ReadChunkSize(); |
|
|
uint exifChunkSize = this.ReadChunkSize(stream); |
|
|
if (this.skipMetadata) |
|
|
if (this.skipMetadata) |
|
|
{ |
|
|
{ |
|
|
this.currentStream.Skip((int)exifChunkSize); |
|
|
stream.Skip((int)exifChunkSize); |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
byte[] exifData = new byte[exifChunkSize]; |
|
|
byte[] exifData = new byte[exifChunkSize]; |
|
|
int bytesRead = this.currentStream.Read(exifData, 0, (int)exifChunkSize); |
|
|
int bytesRead = stream.Read(exifData, 0, (int)exifChunkSize); |
|
|
if (bytesRead != exifChunkSize) |
|
|
if (bytesRead != exifChunkSize) |
|
|
{ |
|
|
{ |
|
|
// Ignore invalid chunk.
|
|
|
// Ignore invalid chunk.
|
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
var profile = new ExifProfile(exifData); |
|
|
metadata.ExifProfile = new(exifData); |
|
|
this.metadata.ExifProfile = profile; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Reads the XMP profile the stream.
|
|
|
/// Reads the XMP profile the stream.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
private void ReadXmpProfile() |
|
|
/// <param name="stream">The stream to decode from.</param>
|
|
|
|
|
|
/// <param name="metadata">The image metadata.</param>
|
|
|
|
|
|
private void ReadXmpProfile(BufferedReadStream stream, ImageMetadata metadata) |
|
|
{ |
|
|
{ |
|
|
uint xmpChunkSize = this.ReadChunkSize(); |
|
|
uint xmpChunkSize = this.ReadChunkSize(stream); |
|
|
if (this.skipMetadata) |
|
|
if (this.skipMetadata) |
|
|
{ |
|
|
{ |
|
|
this.currentStream.Skip((int)xmpChunkSize); |
|
|
stream.Skip((int)xmpChunkSize); |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
byte[] xmpData = new byte[xmpChunkSize]; |
|
|
byte[] xmpData = new byte[xmpChunkSize]; |
|
|
int bytesRead = this.currentStream.Read(xmpData, 0, (int)xmpChunkSize); |
|
|
int bytesRead = stream.Read(xmpData, 0, (int)xmpChunkSize); |
|
|
if (bytesRead != xmpChunkSize) |
|
|
if (bytesRead != xmpChunkSize) |
|
|
{ |
|
|
{ |
|
|
// Ignore invalid chunk.
|
|
|
// Ignore invalid chunk.
|
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
var profile = new XmpProfile(xmpData); |
|
|
metadata.XmpProfile = new(xmpData); |
|
|
this.metadata.XmpProfile = profile; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Reads the ICCP chunk from the stream.
|
|
|
/// Reads the ICCP chunk from the stream.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
private void ReadIccProfile() |
|
|
/// <param name="stream">The stream to decode from.</param>
|
|
|
|
|
|
/// <param name="metadata">The image metadata.</param>
|
|
|
|
|
|
private void ReadIccProfile(BufferedReadStream stream, ImageMetadata metadata) |
|
|
{ |
|
|
{ |
|
|
uint iccpChunkSize = this.ReadChunkSize(); |
|
|
uint iccpChunkSize = this.ReadChunkSize(stream); |
|
|
if (this.skipMetadata) |
|
|
if (this.skipMetadata) |
|
|
{ |
|
|
{ |
|
|
this.currentStream.Skip((int)iccpChunkSize); |
|
|
stream.Skip((int)iccpChunkSize); |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
byte[] iccpData = new byte[iccpChunkSize]; |
|
|
byte[] iccpData = new byte[iccpChunkSize]; |
|
|
int bytesRead = this.currentStream.Read(iccpData, 0, (int)iccpChunkSize); |
|
|
int bytesRead = stream.Read(iccpData, 0, (int)iccpChunkSize); |
|
|
if (bytesRead != iccpChunkSize) |
|
|
if (bytesRead != iccpChunkSize) |
|
|
{ |
|
|
{ |
|
|
WebpThrowHelper.ThrowInvalidImageContentException("Not enough data to read the iccp chunk"); |
|
|
WebpThrowHelper.ThrowInvalidImageContentException("Not enough data to read the iccp chunk"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
var profile = new IccProfile(iccpData); |
|
|
IccProfile profile = new(iccpData); |
|
|
if (profile.CheckIsValid()) |
|
|
if (profile.CheckIsValid()) |
|
|
{ |
|
|
{ |
|
|
this.metadata.IccProfile = profile; |
|
|
metadata.IccProfile = profile; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -387,17 +383,18 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Reads the animation parameters chunk from the stream.
|
|
|
/// Reads the animation parameters chunk from the stream.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="stream">The stream to decode from.</param>
|
|
|
/// <param name="features">The webp features.</param>
|
|
|
/// <param name="features">The webp features.</param>
|
|
|
private void ReadAnimationParameters(WebpFeatures features) |
|
|
private void ReadAnimationParameters(BufferedReadStream stream, WebpFeatures features) |
|
|
{ |
|
|
{ |
|
|
features.Animation = true; |
|
|
features.Animation = true; |
|
|
uint animationChunkSize = WebpChunkParsingUtils.ReadChunkSize(this.currentStream, this.buffer); |
|
|
uint animationChunkSize = WebpChunkParsingUtils.ReadChunkSize(stream, this.buffer); |
|
|
byte blue = (byte)this.currentStream.ReadByte(); |
|
|
byte blue = (byte)stream.ReadByte(); |
|
|
byte green = (byte)this.currentStream.ReadByte(); |
|
|
byte green = (byte)stream.ReadByte(); |
|
|
byte red = (byte)this.currentStream.ReadByte(); |
|
|
byte red = (byte)stream.ReadByte(); |
|
|
byte alpha = (byte)this.currentStream.ReadByte(); |
|
|
byte alpha = (byte)stream.ReadByte(); |
|
|
features.AnimationBackgroundColor = new Color(new Rgba32(red, green, blue, alpha)); |
|
|
features.AnimationBackgroundColor = new Color(new Rgba32(red, green, blue, alpha)); |
|
|
int bytesRead = this.currentStream.Read(this.buffer, 0, 2); |
|
|
int bytesRead = stream.Read(this.buffer, 0, 2); |
|
|
if (bytesRead != 2) |
|
|
if (bytesRead != 2) |
|
|
{ |
|
|
{ |
|
|
WebpThrowHelper.ThrowInvalidImageContentException("Not enough data to read the animation loop count"); |
|
|
WebpThrowHelper.ThrowInvalidImageContentException("Not enough data to read the animation loop count"); |
|
|
@ -409,22 +406,23 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Reads the alpha data chunk data from the stream.
|
|
|
/// Reads the alpha data chunk data from the stream.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="stream">The stream to decode from.</param>
|
|
|
/// <param name="features">The features.</param>
|
|
|
/// <param name="features">The features.</param>
|
|
|
/// <param name="ignoreAlpha">if set to true, skips the chunk data.</param>
|
|
|
/// <param name="ignoreAlpha">if set to true, skips the chunk data.</param>
|
|
|
private void ReadAlphaData(WebpFeatures features, bool ignoreAlpha) |
|
|
private void ReadAlphaData(BufferedReadStream stream, WebpFeatures features, bool ignoreAlpha) |
|
|
{ |
|
|
{ |
|
|
uint alphaChunkSize = WebpChunkParsingUtils.ReadChunkSize(this.currentStream, this.buffer); |
|
|
uint alphaChunkSize = WebpChunkParsingUtils.ReadChunkSize(stream, this.buffer); |
|
|
if (ignoreAlpha) |
|
|
if (ignoreAlpha) |
|
|
{ |
|
|
{ |
|
|
this.currentStream.Skip((int)alphaChunkSize); |
|
|
stream.Skip((int)alphaChunkSize); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
features.AlphaChunkHeader = (byte)this.currentStream.ReadByte(); |
|
|
features.AlphaChunkHeader = (byte)stream.ReadByte(); |
|
|
int alphaDataSize = (int)(alphaChunkSize - 1); |
|
|
int alphaDataSize = (int)(alphaChunkSize - 1); |
|
|
this.alphaData = this.memoryAllocator.Allocate<byte>(alphaDataSize); |
|
|
this.alphaData = this.memoryAllocator.Allocate<byte>(alphaDataSize); |
|
|
Span<byte> alphaData = this.alphaData.GetSpan(); |
|
|
Span<byte> alphaData = this.alphaData.GetSpan(); |
|
|
int bytesRead = this.currentStream.Read(alphaData, 0, alphaDataSize); |
|
|
int bytesRead = stream.Read(alphaData, 0, alphaDataSize); |
|
|
if (bytesRead != alphaDataSize) |
|
|
if (bytesRead != alphaDataSize) |
|
|
{ |
|
|
{ |
|
|
WebpThrowHelper.ThrowInvalidImageContentException("Not enough data to read the alpha data from the stream"); |
|
|
WebpThrowHelper.ThrowInvalidImageContentException("Not enough data to read the alpha data from the stream"); |
|
|
@ -434,15 +432,15 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Identifies the chunk type from the chunk.
|
|
|
/// Identifies the chunk type from the chunk.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="stream">The stream to decode from.</param>
|
|
|
/// <exception cref="ImageFormatException">
|
|
|
/// <exception cref="ImageFormatException">
|
|
|
/// Thrown if the input stream is not valid.
|
|
|
/// Thrown if the input stream is not valid.
|
|
|
/// </exception>
|
|
|
/// </exception>
|
|
|
private WebpChunkType ReadChunkType() |
|
|
private WebpChunkType ReadChunkType(BufferedReadStream stream) |
|
|
{ |
|
|
{ |
|
|
if (this.currentStream.Read(this.buffer, 0, 4) == 4) |
|
|
if (stream.Read(this.buffer, 0, 4) == 4) |
|
|
{ |
|
|
{ |
|
|
var chunkType = (WebpChunkType)BinaryPrimitives.ReadUInt32BigEndian(this.buffer); |
|
|
return (WebpChunkType)BinaryPrimitives.ReadUInt32BigEndian(this.buffer); |
|
|
return chunkType; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
throw new ImageFormatException("Invalid Webp data."); |
|
|
throw new ImageFormatException("Invalid Webp data."); |
|
|
@ -452,10 +450,12 @@ internal sealed class WebpDecoderCore : IImageDecoderInternals, IDisposable |
|
|
/// Reads the chunk size. If Chunk Size is odd, a single padding byte will be added to the payload,
|
|
|
/// Reads the chunk size. If Chunk Size is odd, a single padding byte will be added to the payload,
|
|
|
/// so the chunk size will be increased by 1 in those cases.
|
|
|
/// so the chunk size will be increased by 1 in those cases.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="stream">The stream to decode from.</param>
|
|
|
/// <returns>The chunk size in bytes.</returns>
|
|
|
/// <returns>The chunk size in bytes.</returns>
|
|
|
private uint ReadChunkSize() |
|
|
/// <exception cref="ImageFormatException">Invalid data.</exception>
|
|
|
|
|
|
private uint ReadChunkSize(BufferedReadStream stream) |
|
|
{ |
|
|
{ |
|
|
if (this.currentStream.Read(this.buffer, 0, 4) == 4) |
|
|
if (stream.Read(this.buffer, 0, 4) == 4) |
|
|
{ |
|
|
{ |
|
|
uint chunkSize = BinaryPrimitives.ReadUInt32LittleEndian(this.buffer); |
|
|
uint chunkSize = BinaryPrimitives.ReadUInt32LittleEndian(this.buffer); |
|
|
return (chunkSize % 2 == 0) ? chunkSize : chunkSize + 1; |
|
|
return (chunkSize % 2 == 0) ? chunkSize : chunkSize + 1; |
|
|
|
James Jackson-South
3 years ago
GitHub