Skip to content

Add ANI decoder support #2899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Poker-sang wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Add ANI decoder support #2899

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
aac7d3a
Add Header
zxbmmmmmmmmm Jan 31, 2025
9055bed
Add Unit Test
zxbmmmmmmmmm Feb 2, 2025
1a51a5c
Add AniChunk
zxbmmmmmmmmm Feb 4, 2025
49cf55c
Merge branch 'SixLabors:main' into feat/ani
Poker-sang Mar 4, 2025
e58010a
finish decoder
Poker-sang Mar 5, 2025
33be868
Apply suggestions from code review
Poker-sang Mar 12, 2025
a86f533
format
Poker-sang Mar 12, 2025
6490c10
Merge branch 'main' into feat/ani
JimBobSquarePants Apr 7, 2025
fc9fdee
fix primary ctor
Poker-sang Apr 7, 2025
7377d3c
fix decoder modifier
Poker-sang Apr 7, 2025
c0ad499
use overload ctor
Poker-sang Apr 7, 2025
a979b96
rename FrameDelay
Poker-sang Apr 7, 2025
163bdd4
fix DeepClone
Poker-sang Apr 7, 2025
95f13cc
AfterFrameApply
Poker-sang Apr 7, 2025
fe95636
Span.IsEmpty
Poker-sang Apr 7, 2025
ed0edfe
fix AniMetadata
Poker-sang Apr 7, 2025
ceb0d51
apply new metadata layout
Poker-sang Apr 8, 2025
2569343
update AniFrameFormat
Poker-sang Apr 8, 2025
0658aa5
Merge remote-tracking branch 'upstream/main' into feat/ani
JimBobSquarePants Feb 4, 2026
6fcf75c
Fix merge issues
JimBobSquarePants Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rename FrameDelay
  • Loading branch information
@Poker-sang
Poker-sang committed Apr 7, 2025
commit a979b96abc86d5185c17c2bfaf654c27ba88769c
4 changes: 2 additions & 2 deletions src/ImageSharp/Formats/Ani/AniDecoderCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ protected override Image<TPixel> Decode<TPixel>(BufferedReadStream stream, Cance

ImageFrameMetadata rootFrameMetadata = img.Frames.RootFrame.Metadata;
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.EncodingWidth = encodingWidth;
aniFrameMetadata.EncodingHeight = encodingHeight;
Expand Down Expand Up @@ -201,7 +201,7 @@ protected override ImageInfo Identify(BufferedReadStream stream, CancellationTok

ImageFrameMetadata rootFrameMetadata = imageInfo.FrameMetadataCollection is [var first, ..] ? first : new();
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.EncodingWidth = type switch
{
Expand Down
10 changes: 5 additions & 5 deletions src/ImageSharp/Formats/Ani/AniFrameMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public AniFrameMetadata()
/// <summary>
/// Gets or sets the display time for this frame (in 1/60 seconds)
/// </summary>
public uint Rate { get; set; }
public uint FrameDelay { get; set; }

/// <summary>
/// Gets or sets the frames count of **one** "icon" chunk.
Expand Down Expand Up @@ -49,14 +49,14 @@ public AniFrameMetadata()
public static AniFrameMetadata FromFormatConnectingFrameMetadata(FormatConnectingFrameMetadata metadata) =>
new()
{
Rate = (uint)metadata.Duration.TotalSeconds * 60
FrameDelay = (uint)metadata.Duration.TotalSeconds * 60
};

/// <inheritdoc/>
IDeepCloneable IDeepCloneable.DeepClone() => new AniFrameMetadata { Rate = this.Rate };
IDeepCloneable IDeepCloneable.DeepClone() => new AniFrameMetadata { FrameDelay = this.FrameDelay };

/// <inheritdoc/>
public FormatConnectingFrameMetadata ToFormatConnectingFrameMetadata() => new FormatConnectingFrameMetadata() { Duration = TimeSpan.FromSeconds(this.Rate / 60d) };
public FormatConnectingFrameMetadata ToFormatConnectingFrameMetadata() => new FormatConnectingFrameMetadata() { Duration = TimeSpan.FromSeconds(this.FrameDelay / 60d) };

/// <inheritdoc/>
public void AfterFrameApply<TPixel>(ImageFrame<TPixel> source, ImageFrame<TPixel> destination)
Expand All @@ -66,5 +66,5 @@ public void AfterFrameApply<TPixel>(ImageFrame<TPixel> source, ImageFrame<TPixel
}

/// <inheritdoc/>
public AniFrameMetadata DeepClone() => new() { Rate = this.Rate };
public AniFrameMetadata DeepClone() => new() { FrameDelay = this.FrameDelay };
}