|
|
@ -30,7 +30,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// The only supported precision
|
|
|
/// The only supported precision
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
private readonly int[] supportedPrecisions = { 8, 12 }; |
|
|
private readonly byte[] supportedPrecisions = { 8, 12 }; |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// The buffer used to temporarily store bytes read from the stream.
|
|
|
/// The buffer used to temporarily store bytes read from the stream.
|
|
|
@ -42,21 +42,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
private readonly byte[] markerBuffer = new byte[2]; |
|
|
private readonly byte[] markerBuffer = new byte[2]; |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// The DC Huffman tables.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
private HuffmanTable[] dcHuffmanTables; |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// The AC Huffman tables
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
private HuffmanTable[] acHuffmanTables; |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// The reset interval determined by RST markers.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
private ushort resetInterval; |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Whether the image has an EXIF marker.
|
|
|
/// Whether the image has an EXIF marker.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
@ -122,30 +107,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
public JpegFrame Frame { get; private set; } |
|
|
public JpegFrame Frame { get; private set; } |
|
|
|
|
|
|
|
|
/// <inheritdoc/>
|
|
|
/// <inheritdoc/>
|
|
|
public Size ImageSizeInPixels { get; private set; } |
|
|
Size IImageDecoderInternals.Dimensions => this.Frame.PixelSize; |
|
|
|
|
|
|
|
|
/// <inheritdoc/>
|
|
|
|
|
|
Size IImageDecoderInternals.Dimensions => this.ImageSizeInPixels; |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Gets the number of MCU blocks in the image as <see cref="Size"/>.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public Size ImageSizeInMCU { get; private set; } |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Gets the image width
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public int ImageWidth => this.ImageSizeInPixels.Width; |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Gets the image height
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public int ImageHeight => this.ImageSizeInPixels.Height; |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Gets the color depth, in number of bits per pixel.
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public int BitsPerPixel => this.ComponentCount * this.Frame.Precision; |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Gets a value indicating whether the metadata should be ignored when the image is being decoded.
|
|
|
/// Gets a value indicating whether the metadata should be ignored when the image is being decoded.
|
|
|
@ -157,15 +119,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
public ImageMetadata Metadata { get; private set; } |
|
|
public ImageMetadata Metadata { get; private set; } |
|
|
|
|
|
|
|
|
/// <inheritdoc/>
|
|
|
|
|
|
public int ComponentCount { get; private set; } |
|
|
|
|
|
|
|
|
|
|
|
/// <inheritdoc/>
|
|
|
/// <inheritdoc/>
|
|
|
public JpegColorSpace ColorSpace { get; private set; } |
|
|
public JpegColorSpace ColorSpace { get; private set; } |
|
|
|
|
|
|
|
|
/// <inheritdoc/>
|
|
|
|
|
|
public int Precision { get; private set; } |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Gets the components.
|
|
|
/// Gets the components.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
@ -240,7 +196,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
this.InitIptcProfile(); |
|
|
this.InitIptcProfile(); |
|
|
this.InitDerivedMetadataProperties(); |
|
|
this.InitDerivedMetadataProperties(); |
|
|
|
|
|
|
|
|
return new ImageInfo(new PixelTypeInfo(this.BitsPerPixel), this.ImageWidth, this.ImageHeight, this.Metadata); |
|
|
Size pixelSize = this.Frame.PixelSize; |
|
|
|
|
|
return new ImageInfo(new PixelTypeInfo(this.Frame.BitsPerPixel), pixelSize.Width, pixelSize.Height, this.Metadata); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
@ -270,14 +227,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
fileMarker = new JpegFileMarker(marker, (int)stream.Position - 2); |
|
|
fileMarker = new JpegFileMarker(marker, (int)stream.Position - 2); |
|
|
this.QuantizationTables = new Block8x8F[4]; |
|
|
this.QuantizationTables = new Block8x8F[4]; |
|
|
|
|
|
|
|
|
// Only assign what we need
|
|
|
|
|
|
if (!metadataOnly) |
|
|
|
|
|
{ |
|
|
|
|
|
const int maxTables = 4; |
|
|
|
|
|
this.dcHuffmanTables = new HuffmanTable[maxTables]; |
|
|
|
|
|
this.acHuffmanTables = new HuffmanTable[maxTables]; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Break only when we discover a valid EOI marker.
|
|
|
// Break only when we discover a valid EOI marker.
|
|
|
// https://github.com/SixLabors/ImageSharp/issues/695
|
|
|
// https://github.com/SixLabors/ImageSharp/issues/695
|
|
|
while (fileMarker.Marker != JpegConstants.Markers.EOI |
|
|
while (fileMarker.Marker != JpegConstants.Markers.EOI |
|
|
@ -301,7 +250,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
case JpegConstants.Markers.SOS: |
|
|
case JpegConstants.Markers.SOS: |
|
|
if (!metadataOnly) |
|
|
if (!metadataOnly) |
|
|
{ |
|
|
{ |
|
|
this.ProcessStartOfScanMarker(stream, cancellationToken); |
|
|
this.ProcessStartOfScanMarker(stream, remaining, cancellationToken); |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
@ -392,22 +341,21 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
|
|
|
|
|
|
// Set large fields to null.
|
|
|
// Set large fields to null.
|
|
|
this.Frame = null; |
|
|
this.Frame = null; |
|
|
this.dcHuffmanTables = null; |
|
|
this.scanDecoder = null; |
|
|
this.acHuffmanTables = null; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Returns the correct colorspace based on the image component count
|
|
|
/// Returns the correct colorspace based on the image component count
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
/// <returns>The <see cref="JpegColorSpace"/></returns>
|
|
|
/// <returns>The <see cref="JpegColorSpace"/></returns>
|
|
|
private JpegColorSpace DeduceJpegColorSpace() |
|
|
private JpegColorSpace DeduceJpegColorSpace(byte componentCount) |
|
|
{ |
|
|
{ |
|
|
if (this.ComponentCount == 1) |
|
|
if (componentCount == 1) |
|
|
{ |
|
|
{ |
|
|
return JpegColorSpace.Grayscale; |
|
|
return JpegColorSpace.Grayscale; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (this.ComponentCount == 3) |
|
|
if (componentCount == 3) |
|
|
{ |
|
|
{ |
|
|
if (!this.adobe.Equals(default) && this.adobe.ColorTransform == JpegConstants.Adobe.ColorTransformUnknown) |
|
|
if (!this.adobe.Equals(default) && this.adobe.ColorTransform == JpegConstants.Adobe.ColorTransformUnknown) |
|
|
{ |
|
|
{ |
|
|
@ -419,14 +367,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
return JpegColorSpace.YCbCr; |
|
|
return JpegColorSpace.YCbCr; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (this.ComponentCount == 4) |
|
|
if (componentCount == 4) |
|
|
{ |
|
|
{ |
|
|
return this.adobe.ColorTransform == JpegConstants.Adobe.ColorTransformYcck |
|
|
return this.adobe.ColorTransform == JpegConstants.Adobe.ColorTransformYcck |
|
|
? JpegColorSpace.Ycck |
|
|
? JpegColorSpace.Ycck |
|
|
: JpegColorSpace.Cmyk; |
|
|
: JpegColorSpace.Cmyk; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
JpegThrowHelper.ThrowInvalidImageContentException($"Unsupported color mode. Supported component counts 1, 3, and 4; found {this.ComponentCount}"); |
|
|
JpegThrowHelper.ThrowInvalidImageContentException($"Unsupported color mode. Supported component counts 1, 3, and 4; found {componentCount}"); |
|
|
return default; |
|
|
return default; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -565,7 +513,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
JpegThrowHelper.ThrowInvalidImageContentException("Bad App1 Marker length."); |
|
|
JpegThrowHelper.ThrowInvalidImageContentException("Bad App1 Marker length."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
var profile = new byte[remaining]; |
|
|
byte[] profile = new byte[remaining]; |
|
|
stream.Read(profile, 0, remaining); |
|
|
stream.Read(profile, 0, remaining); |
|
|
|
|
|
|
|
|
if (ProfileResolver.IsProfile(profile, ProfileResolver.ExifMarker)) |
|
|
if (ProfileResolver.IsProfile(profile, ProfileResolver.ExifMarker)) |
|
|
@ -599,14 +547,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
var identifier = new byte[Icclength]; |
|
|
byte[] identifier = new byte[Icclength]; |
|
|
stream.Read(identifier, 0, Icclength); |
|
|
stream.Read(identifier, 0, Icclength); |
|
|
remaining -= Icclength; // We have read it by this point
|
|
|
remaining -= Icclength; // We have read it by this point
|
|
|
|
|
|
|
|
|
if (ProfileResolver.IsProfile(identifier, ProfileResolver.IccMarker)) |
|
|
if (ProfileResolver.IsProfile(identifier, ProfileResolver.IccMarker)) |
|
|
{ |
|
|
{ |
|
|
this.isIcc = true; |
|
|
this.isIcc = true; |
|
|
var profile = new byte[remaining]; |
|
|
byte[] profile = new byte[remaining]; |
|
|
stream.Read(profile, 0, remaining); |
|
|
stream.Read(profile, 0, remaining); |
|
|
|
|
|
|
|
|
if (this.iccData is null) |
|
|
if (this.iccData is null) |
|
|
@ -644,7 +592,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
remaining -= ProfileResolver.AdobePhotoshopApp13Marker.Length; |
|
|
remaining -= ProfileResolver.AdobePhotoshopApp13Marker.Length; |
|
|
if (ProfileResolver.IsProfile(this.temp, ProfileResolver.AdobePhotoshopApp13Marker)) |
|
|
if (ProfileResolver.IsProfile(this.temp, ProfileResolver.AdobePhotoshopApp13Marker)) |
|
|
{ |
|
|
{ |
|
|
var resourceBlockData = new byte[remaining]; |
|
|
byte[] resourceBlockData = new byte[remaining]; |
|
|
stream.Read(resourceBlockData, 0, remaining); |
|
|
stream.Read(resourceBlockData, 0, remaining); |
|
|
Span<byte> blockDataSpan = resourceBlockData.AsSpan(); |
|
|
Span<byte> blockDataSpan = resourceBlockData.AsSpan(); |
|
|
|
|
|
|
|
|
@ -659,8 +607,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
Span<byte> imageResourceBlockId = blockDataSpan.Slice(0, 2); |
|
|
Span<byte> imageResourceBlockId = blockDataSpan.Slice(0, 2); |
|
|
if (ProfileResolver.IsProfile(imageResourceBlockId, ProfileResolver.AdobeIptcMarker)) |
|
|
if (ProfileResolver.IsProfile(imageResourceBlockId, ProfileResolver.AdobeIptcMarker)) |
|
|
{ |
|
|
{ |
|
|
var resourceBlockNameLength = ReadImageResourceNameLength(blockDataSpan); |
|
|
int resourceBlockNameLength = ReadImageResourceNameLength(blockDataSpan); |
|
|
var resourceDataSize = ReadResourceDataLength(blockDataSpan, resourceBlockNameLength); |
|
|
int resourceDataSize = ReadResourceDataLength(blockDataSpan, resourceBlockNameLength); |
|
|
int dataStartIdx = 2 + resourceBlockNameLength + 4; |
|
|
int dataStartIdx = 2 + resourceBlockNameLength + 4; |
|
|
if (resourceDataSize > 0 && blockDataSpan.Length >= dataStartIdx + resourceDataSize) |
|
|
if (resourceDataSize > 0 && blockDataSpan.Length >= dataStartIdx + resourceDataSize) |
|
|
{ |
|
|
{ |
|
|
@ -671,8 +619,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
var resourceBlockNameLength = ReadImageResourceNameLength(blockDataSpan); |
|
|
int resourceBlockNameLength = ReadImageResourceNameLength(blockDataSpan); |
|
|
var resourceDataSize = ReadResourceDataLength(blockDataSpan, resourceBlockNameLength); |
|
|
int resourceDataSize = ReadResourceDataLength(blockDataSpan, resourceBlockNameLength); |
|
|
int dataStartIdx = 2 + resourceBlockNameLength + 4; |
|
|
int dataStartIdx = 2 + resourceBlockNameLength + 4; |
|
|
if (blockDataSpan.Length < dataStartIdx + resourceDataSize) |
|
|
if (blockDataSpan.Length < dataStartIdx + resourceDataSize) |
|
|
{ |
|
|
{ |
|
|
@ -695,7 +643,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
private static int ReadImageResourceNameLength(Span<byte> blockDataSpan) |
|
|
private static int ReadImageResourceNameLength(Span<byte> blockDataSpan) |
|
|
{ |
|
|
{ |
|
|
byte nameLength = blockDataSpan[2]; |
|
|
byte nameLength = blockDataSpan[2]; |
|
|
var nameDataSize = nameLength == 0 ? 2 : nameLength; |
|
|
int nameDataSize = nameLength == 0 ? 2 : nameLength; |
|
|
if (nameDataSize % 2 != 0) |
|
|
if (nameDataSize % 2 != 0) |
|
|
{ |
|
|
{ |
|
|
nameDataSize++; |
|
|
nameDataSize++; |
|
|
@ -712,9 +660,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
/// <returns>The block length.</returns>
|
|
|
/// <returns>The block length.</returns>
|
|
|
[MethodImpl(InliningOptions.ShortMethod)] |
|
|
[MethodImpl(InliningOptions.ShortMethod)] |
|
|
private static int ReadResourceDataLength(Span<byte> blockDataSpan, int resourceBlockNameLength) |
|
|
private static int ReadResourceDataLength(Span<byte> blockDataSpan, int resourceBlockNameLength) |
|
|
{ |
|
|
=> BinaryPrimitives.ReadInt32BigEndian(blockDataSpan.Slice(2 + resourceBlockNameLength, 4)); |
|
|
return BinaryPrimitives.ReadInt32BigEndian(blockDataSpan.Slice(2 + resourceBlockNameLength, 4)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Processes the application header containing the Adobe identifier
|
|
|
/// Processes the application header containing the Adobe identifier
|
|
|
@ -849,60 +795,62 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
JpegThrowHelper.ThrowInvalidImageContentException("Multiple SOF markers. Only single frame jpegs supported."); |
|
|
JpegThrowHelper.ThrowInvalidImageContentException("Multiple SOF markers. Only single frame jpegs supported."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Read initial marker definitions.
|
|
|
// Read initial marker definitions
|
|
|
const int length = 6; |
|
|
const int length = 6; |
|
|
stream.Read(this.temp, 0, length); |
|
|
stream.Read(this.temp, 0, length); |
|
|
|
|
|
|
|
|
// We only support 8-bit and 12-bit precision.
|
|
|
// 1 byte: Bits/sample precision
|
|
|
if (Array.IndexOf(this.supportedPrecisions, this.temp[0]) == -1) |
|
|
byte precision = this.temp[0]; |
|
|
|
|
|
|
|
|
|
|
|
// Validate: only 8-bit and 12-bit precisions are supported
|
|
|
|
|
|
if (Array.IndexOf(this.supportedPrecisions, precision) == -1) |
|
|
{ |
|
|
{ |
|
|
JpegThrowHelper.ThrowInvalidImageContentException("Only 8-Bit and 12-Bit precision supported."); |
|
|
JpegThrowHelper.ThrowInvalidImageContentException("Only 8-Bit and 12-Bit precision supported."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
this.Precision = this.temp[0]; |
|
|
// 2 byte: Height
|
|
|
|
|
|
int frameHeight = (this.temp[1] << 8) | this.temp[2]; |
|
|
|
|
|
|
|
|
this.Frame = new JpegFrame |
|
|
// 2 byte: Width
|
|
|
{ |
|
|
int frameWidth = (this.temp[3] << 8) | this.temp[4]; |
|
|
Extended = frameMarker.Marker == JpegConstants.Markers.SOF1, |
|
|
|
|
|
Progressive = frameMarker.Marker == JpegConstants.Markers.SOF2, |
|
|
// Validate: width/height > 0 (they are upper-bounded by 2 byte max value so no need to check that)
|
|
|
Precision = this.temp[0], |
|
|
if (frameHeight == 0 || frameWidth == 0) |
|
|
PixelHeight = (this.temp[1] << 8) | this.temp[2], |
|
|
|
|
|
PixelWidth = (this.temp[3] << 8) | this.temp[4], |
|
|
|
|
|
ComponentCount = this.temp[5] |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
if (this.Frame.PixelWidth == 0 || this.Frame.PixelHeight == 0) |
|
|
|
|
|
{ |
|
|
{ |
|
|
JpegThrowHelper.ThrowInvalidImageDimensions(this.Frame.PixelWidth, this.Frame.PixelHeight); |
|
|
JpegThrowHelper.ThrowInvalidImageDimensions(frameWidth, frameHeight); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
this.ImageSizeInPixels = new Size(this.Frame.PixelWidth, this.Frame.PixelHeight); |
|
|
// 1 byte: Number of components
|
|
|
this.ComponentCount = this.Frame.ComponentCount; |
|
|
byte componentCount = this.temp[5]; |
|
|
|
|
|
this.ColorSpace = this.DeduceJpegColorSpace(componentCount); |
|
|
|
|
|
|
|
|
this.ColorSpace = this.DeduceJpegColorSpace(); |
|
|
|
|
|
this.Metadata.GetJpegMetadata().ColorType = this.ColorSpace == JpegColorSpace.Grayscale ? JpegColorType.Luminance : JpegColorType.YCbCr; |
|
|
this.Metadata.GetJpegMetadata().ColorType = this.ColorSpace == JpegColorSpace.Grayscale ? JpegColorType.Luminance : JpegColorType.YCbCr; |
|
|
|
|
|
|
|
|
|
|
|
this.Frame = new JpegFrame(frameMarker, precision, frameWidth, frameHeight, componentCount); |
|
|
|
|
|
|
|
|
if (!metadataOnly) |
|
|
if (!metadataOnly) |
|
|
{ |
|
|
{ |
|
|
remaining -= length; |
|
|
remaining -= length; |
|
|
|
|
|
|
|
|
|
|
|
// Validate: remaining part must be equal to components * 3
|
|
|
const int componentBytes = 3; |
|
|
const int componentBytes = 3; |
|
|
if (remaining > this.ComponentCount * componentBytes) |
|
|
if (remaining != componentCount * componentBytes) |
|
|
{ |
|
|
{ |
|
|
JpegThrowHelper.ThrowBadMarker("SOFn", remaining); |
|
|
JpegThrowHelper.ThrowBadMarker("SOFn", remaining); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// components*3 bytes: component data
|
|
|
stream.Read(this.temp, 0, remaining); |
|
|
stream.Read(this.temp, 0, remaining); |
|
|
|
|
|
|
|
|
// No need to pool this. They max out at 4
|
|
|
// No need to pool this. They max out at 4
|
|
|
this.Frame.ComponentIds = new byte[this.ComponentCount]; |
|
|
this.Frame.ComponentIds = new byte[componentCount]; |
|
|
this.Frame.ComponentOrder = new byte[this.ComponentCount]; |
|
|
this.Frame.ComponentOrder = new byte[componentCount]; |
|
|
this.Frame.Components = new JpegComponent[this.ComponentCount]; |
|
|
this.Frame.Components = new JpegComponent[componentCount]; |
|
|
|
|
|
|
|
|
int maxH = 0; |
|
|
int maxH = 0; |
|
|
int maxV = 0; |
|
|
int maxV = 0; |
|
|
int index = 0; |
|
|
int index = 0; |
|
|
for (int i = 0; i < this.ComponentCount; i++) |
|
|
for (int i = 0; i < componentCount; i++) |
|
|
{ |
|
|
{ |
|
|
byte hv = this.temp[index + 1]; |
|
|
byte hv = this.temp[index + 1]; |
|
|
int h = (hv >> 4) & 15; |
|
|
int h = (hv >> 4) & 15; |
|
|
@ -926,13 +874,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
index += componentBytes; |
|
|
index += componentBytes; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
this.Frame.MaxHorizontalFactor = maxH; |
|
|
this.Frame.Init(maxH, maxV); |
|
|
this.Frame.MaxVerticalFactor = maxV; |
|
|
|
|
|
this.Frame.InitComponents(); |
|
|
|
|
|
|
|
|
|
|
|
this.ImageSizeInMCU = new Size(this.Frame.McusPerLine, this.Frame.McusPerColumn); |
|
|
|
|
|
|
|
|
|
|
|
// This can be injected in SOF marker callback
|
|
|
|
|
|
this.scanDecoder.InjectFrameData(this.Frame, this); |
|
|
this.scanDecoder.InjectFrameData(this.Frame, this); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -996,8 +939,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
|
|
|
|
|
|
i += 17 + codeLengthSum; |
|
|
i += 17 + codeLengthSum; |
|
|
|
|
|
|
|
|
this.BuildHuffmanTable( |
|
|
this.scanDecoder.BuildHuffmanTable( |
|
|
tableType == 0 ? this.dcHuffmanTables : this.acHuffmanTables, |
|
|
tableType, |
|
|
tableIndex, |
|
|
tableIndex, |
|
|
codeLengthsSpan, |
|
|
codeLengthsSpan, |
|
|
huffmanValuesSpan); |
|
|
huffmanValuesSpan); |
|
|
@ -1020,87 +963,101 @@ namespace SixLabors.ImageSharp.Formats.Jpeg |
|
|
JpegThrowHelper.ThrowBadMarker(nameof(JpegConstants.Markers.DRI), remaining); |
|
|
JpegThrowHelper.ThrowBadMarker(nameof(JpegConstants.Markers.DRI), remaining); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
this.resetInterval = this.ReadUint16(stream); |
|
|
this.scanDecoder.ResetInterval = this.ReadUint16(stream); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Processes the SOS (Start of scan marker).
|
|
|
/// Processes the SOS (Start of scan marker).
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
private void ProcessStartOfScanMarker(BufferedReadStream stream, CancellationToken cancellationToken) |
|
|
private void ProcessStartOfScanMarker(BufferedReadStream stream, int remaining, CancellationToken cancellationToken) |
|
|
{ |
|
|
{ |
|
|
if (this.Frame is null) |
|
|
if (this.Frame is null) |
|
|
{ |
|
|
{ |
|
|
JpegThrowHelper.ThrowInvalidImageContentException("No readable SOFn (Start Of Frame) marker found."); |
|
|
JpegThrowHelper.ThrowInvalidImageContentException("No readable SOFn (Start Of Frame) marker found."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 1 byte: Number of components in scan
|
|
|
int selectorsCount = stream.ReadByte(); |
|
|
int selectorsCount = stream.ReadByte(); |
|
|
|
|
|
|
|
|
|
|
|
// Validate: 0 < count <= totalComponents
|
|
|
|
|
|
if (selectorsCount == 0 || selectorsCount > this.Frame.ComponentCount) |
|
|
|
|
|
{ |
|
|
|
|
|
// TODO: extract as separate method?
|
|
|
|
|
|
JpegThrowHelper.ThrowInvalidImageContentException($"Invalid number of components in scan: {selectorsCount}."); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Validate: marker must contain exactly (4 + selectorsCount*2) bytes
|
|
|
|
|
|
int selectorsBytes = selectorsCount * 2; |
|
|
|
|
|
if (remaining != 4 + selectorsBytes) |
|
|
|
|
|
{ |
|
|
|
|
|
JpegThrowHelper.ThrowBadMarker("SOS", remaining); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// selectorsCount*2 bytes: component index + huffman tables indices
|
|
|
|
|
|
stream.Read(this.temp, 0, selectorsBytes); |
|
|
|
|
|
|
|
|
this.Frame.MultiScan = this.Frame.ComponentCount != selectorsCount; |
|
|
this.Frame.MultiScan = this.Frame.ComponentCount != selectorsCount; |
|
|
for (int i = 0; i < selectorsCount; i++) |
|
|
for (int i = 0; i < selectorsBytes; i += 2) |
|
|
{ |
|
|
{ |
|
|
int componentIndex = -1; |
|
|
// 1 byte: Component id
|
|
|
int selector = stream.ReadByte(); |
|
|
int componentSelectorId = this.temp[i]; |
|
|
|
|
|
|
|
|
|
|
|
int componentIndex = -1; |
|
|
for (int j = 0; j < this.Frame.ComponentIds.Length; j++) |
|
|
for (int j = 0; j < this.Frame.ComponentIds.Length; j++) |
|
|
{ |
|
|
{ |
|
|
byte id = this.Frame.ComponentIds[j]; |
|
|
byte id = this.Frame.ComponentIds[j]; |
|
|
if (selector == id) |
|
|
if (componentSelectorId == id) |
|
|
{ |
|
|
{ |
|
|
componentIndex = j; |
|
|
componentIndex = j; |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (componentIndex < 0) |
|
|
// Validate: must be found among registered components
|
|
|
|
|
|
if (componentIndex == -1) |
|
|
{ |
|
|
{ |
|
|
JpegThrowHelper.ThrowInvalidImageContentException($"Unknown component selector {componentIndex}."); |
|
|
// TODO: extract as separate method?
|
|
|
|
|
|
JpegThrowHelper.ThrowInvalidImageContentException($"Unknown component id in scan: {componentSelectorId}."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
ref JpegComponent component = ref this.Frame.Components[componentIndex]; |
|
|
this.Frame.ComponentOrder[i / 2] = (byte)componentIndex; |
|
|
int tableSpec = stream.ReadByte(); |
|
|
|
|
|
component.DCHuffmanTableId = tableSpec >> 4; |
|
|
|
|
|
component.ACHuffmanTableId = tableSpec & 15; |
|
|
|
|
|
this.Frame.ComponentOrder[i] = (byte)componentIndex; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
stream.Read(this.temp, 0, 3); |
|
|
JpegComponent component = this.Frame.Components[componentIndex]; |
|
|
|
|
|
|
|
|
int spectralStart = this.temp[0]; |
|
|
// 1 byte: Huffman table selectors.
|
|
|
int spectralEnd = this.temp[1]; |
|
|
// 4 bits - dc
|
|
|
int successiveApproximation = this.temp[2]; |
|
|
// 4 bits - ac
|
|
|
|
|
|
int tableSpec = this.temp[i + 1]; |
|
|
|
|
|
int dcTableIndex = tableSpec >> 4; |
|
|
|
|
|
int acTableIndex = tableSpec & 15; |
|
|
|
|
|
|
|
|
// All the comments below are for separate refactoring PR
|
|
|
// Validate: both must be < 4
|
|
|
// Main reason it's not fixed here is to make this commit less intrusive
|
|
|
if (dcTableIndex >= 4 || acTableIndex >= 4) |
|
|
|
|
|
{ |
|
|
// Huffman tables can be calculated directly in the scan decoder class
|
|
|
// TODO: extract as separate method?
|
|
|
this.scanDecoder.DcHuffmanTables = this.dcHuffmanTables; |
|
|
JpegThrowHelper.ThrowInvalidImageContentException($"Invalid huffman table for component:{componentSelectorId}: dc={dcTableIndex}, ac={acTableIndex}"); |
|
|
this.scanDecoder.AcHuffmanTables = this.acHuffmanTables; |
|
|
} |
|
|
|
|
|
|
|
|
// This can be injectd in DRI marker callback
|
|
|
component.DCHuffmanTableId = dcTableIndex; |
|
|
this.scanDecoder.ResetInterval = this.resetInterval; |
|
|
component.ACHuffmanTableId = acTableIndex; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// This can be passed as ParseEntropyCodedData() parameter as it is used only there
|
|
|
// 3 bytes: Progressive scan decoding data
|
|
|
this.scanDecoder.ComponentsLength = selectorsCount; |
|
|
stream.Read(this.temp, 0, 3); |
|
|
|
|
|
|
|
|
// This is okay to inject here, might be good to wrap it in a separate struct but not really necessary
|
|
|
int spectralStart = this.temp[0]; |
|
|
this.scanDecoder.SpectralStart = spectralStart; |
|
|
this.scanDecoder.SpectralStart = spectralStart; |
|
|
|
|
|
|
|
|
|
|
|
int spectralEnd = this.temp[1]; |
|
|
this.scanDecoder.SpectralEnd = spectralEnd; |
|
|
this.scanDecoder.SpectralEnd = spectralEnd; |
|
|
|
|
|
|
|
|
|
|
|
int successiveApproximation = this.temp[2]; |
|
|
this.scanDecoder.SuccessiveHigh = successiveApproximation >> 4; |
|
|
this.scanDecoder.SuccessiveHigh = successiveApproximation >> 4; |
|
|
this.scanDecoder.SuccessiveLow = successiveApproximation & 15; |
|
|
this.scanDecoder.SuccessiveLow = successiveApproximation & 15; |
|
|
|
|
|
|
|
|
this.scanDecoder.ParseEntropyCodedData(); |
|
|
this.scanDecoder.ParseEntropyCodedData(selectorsCount); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Builds the huffman tables
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="tables">The tables</param>
|
|
|
|
|
|
/// <param name="index">The table index</param>
|
|
|
|
|
|
/// <param name="codeLengths">The codelengths</param>
|
|
|
|
|
|
/// <param name="values">The values</param>
|
|
|
|
|
|
[MethodImpl(InliningOptions.ShortMethod)] |
|
|
|
|
|
private void BuildHuffmanTable(HuffmanTable[] tables, int index, ReadOnlySpan<byte> codeLengths, ReadOnlySpan<byte> values) |
|
|
|
|
|
=> tables[index] = new HuffmanTable(codeLengths, values); |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Reads a <see cref="ushort"/> from the stream advancing it by two bytes
|
|
|
/// Reads a <see cref="ushort"/> from the stream advancing it by two bytes
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
|
James Jackson-South
5 years ago
GitHub
