Browse Source

rename FrameDelay

pull/2899/head
Poker 1 year ago
parent
commit
a979b96abc
No known key found for this signature in database GPG Key ID: C65A6AD457D5C8F8
  1. 4
      src/ImageSharp/Formats/Ani/AniDecoderCore.cs
  2. 10
      src/ImageSharp/Formats/Ani/AniFrameMetadata.cs

4
src/ImageSharp/Formats/Ani/AniDecoderCore.cs

@ -114,7 +114,7 @@ internal class AniDecoderCore : ImageDecoderCore
ImageFrameMetadata rootFrameMetadata = img.Frames.RootFrame.Metadata; ImageFrameMetadata rootFrameMetadata = img.Frames.RootFrame.Metadata;
AniFrameMetadata aniFrameMetadata = rootFrameMetadata.GetAniMetadata(); AniFrameMetadata aniFrameMetadata = rootFrameMetadata.GetAniMetadata();
aniFrameMetadata.Rate = rate == default ? aniMetadata.DisplayRate : rate[i]; aniFrameMetadata.FrameDelay = rate == default ? aniMetadata.DisplayRate : rate[i];
aniFrameMetadata.FrameCount = img.Frames.Count; aniFrameMetadata.FrameCount = img.Frames.Count;
aniFrameMetadata.EncodingWidth = encodingWidth; aniFrameMetadata.EncodingWidth = encodingWidth;
aniFrameMetadata.EncodingHeight = encodingHeight; aniFrameMetadata.EncodingHeight = encodingHeight;
@ -201,7 +201,7 @@ internal class AniDecoderCore : ImageDecoderCore
ImageFrameMetadata rootFrameMetadata = imageInfo.FrameMetadataCollection is [var first, ..] ? first : new(); ImageFrameMetadata rootFrameMetadata = imageInfo.FrameMetadataCollection is [var first, ..] ? first : new();
AniFrameMetadata aniFrameMetadata = rootFrameMetadata.GetAniMetadata(); AniFrameMetadata aniFrameMetadata = rootFrameMetadata.GetAniMetadata();
aniFrameMetadata.Rate = rate == default ? aniMetadata.DisplayRate : rate[i]; aniFrameMetadata.FrameDelay = rate == default ? aniMetadata.DisplayRate : rate[i];
aniFrameMetadata.FrameCount = info.FrameMetadataCollection.Count; aniFrameMetadata.FrameCount = info.FrameMetadataCollection.Count;
aniFrameMetadata.EncodingWidth = type switch aniFrameMetadata.EncodingWidth = type switch
{ {

10
src/ImageSharp/Formats/Ani/AniFrameMetadata.cs

@ -21,7 +21,7 @@ public class AniFrameMetadata : IFormatFrameMetadata<AniFrameMetadata>
/// <summary> /// <summary>
/// Gets or sets the display time for this frame (in 1/60 seconds) /// Gets or sets the display time for this frame (in 1/60 seconds)
/// </summary> /// </summary>
public uint Rate { get; set; } public uint FrameDelay { get; set; }
/// <summary> /// <summary>
/// Gets or sets the frames count of **one** "icon" chunk. /// Gets or sets the frames count of **one** "icon" chunk.
@ -49,14 +49,14 @@ public class AniFrameMetadata : IFormatFrameMetadata<AniFrameMetadata>
public static AniFrameMetadata FromFormatConnectingFrameMetadata(FormatConnectingFrameMetadata metadata) => public static AniFrameMetadata FromFormatConnectingFrameMetadata(FormatConnectingFrameMetadata metadata) =>
new() new()
{ {
Rate = (uint)metadata.Duration.TotalSeconds * 60 FrameDelay = (uint)metadata.Duration.TotalSeconds * 60
}; };
/// <inheritdoc/> /// <inheritdoc/>
IDeepCloneable IDeepCloneable.DeepClone() => new AniFrameMetadata { Rate = this.Rate }; IDeepCloneable IDeepCloneable.DeepClone() => new AniFrameMetadata { FrameDelay = this.FrameDelay };
/// <inheritdoc/> /// <inheritdoc/>
public FormatConnectingFrameMetadata ToFormatConnectingFrameMetadata() => new FormatConnectingFrameMetadata() { Duration = TimeSpan.FromSeconds(this.Rate / 60d) }; public FormatConnectingFrameMetadata ToFormatConnectingFrameMetadata() => new FormatConnectingFrameMetadata() { Duration = TimeSpan.FromSeconds(this.FrameDelay / 60d) };
/// <inheritdoc/> /// <inheritdoc/>
public void AfterFrameApply<TPixel>(ImageFrame<TPixel> source, ImageFrame<TPixel> destination) public void AfterFrameApply<TPixel>(ImageFrame<TPixel> source, ImageFrame<TPixel> destination)
@ -66,5 +66,5 @@ public class AniFrameMetadata : IFormatFrameMetadata<AniFrameMetadata>
} }
/// <inheritdoc/> /// <inheritdoc/>
public AniFrameMetadata DeepClone() => new() { Rate = this.Rate }; public AniFrameMetadata DeepClone() => new() { FrameDelay = this.FrameDelay };
} }

Loading…
Cancel
Save