Skip to content

Commit 8ec3bc8

Browse files
committed
Added encodeWithFrames API for animation encoding in custom coder, better for usage
The exist API need wrap the frames into a new image and extract, consume RAM and CPU
1 parent c0f7023 commit 8ec3bc8

File tree

5 files changed

+70
-13
lines changed

5 files changed

+70
-13
lines changed

SDWebImage/Core/SDImageCoder.h

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#import <Foundation/Foundation.h>
1010
#import "SDWebImageCompat.h"
1111
#import "NSData+ImageContentType.h"
12+
#import "SDImageFrame.h"
1213

1314
typedef NSString * SDImageCoderOption NS_STRING_ENUM;
1415
typedef NSDictionary<SDImageCoderOption, id> SDImageCoderOptions;
@@ -171,7 +172,8 @@ FOUNDATION_EXPORT SDImageCoderOption _Nonnull const SDImageCoderWebImageContext
171172

172173
/**
173174
Encode the image to image data.
174-
@note This protocol may supports encode animated image frames. You can use `+[SDImageCoderHelper framesFromAnimatedImage:]` to assemble an animated image with frames.
175+
@note This protocol may supports encode animated image frames. You can use `+[SDImageCoderHelper framesFromAnimatedImage:]` to assemble an animated image with frames. But this consume time is not always reversible. In 5.15.0, we introduce `encodedDataWithFrames` API for better animated image encoding. Use that instead.
176+
@note Which means, this just forward to `encodedDataWithFrames([SDImageFrame(image: image, duration: 0], image.sd_imageLoopCount))`
175177
176178
@param image The image to be encoded
177179
@param format The image format to encode, you should note `SDImageFormatUndefined` format is also possible
@@ -182,6 +184,21 @@ FOUNDATION_EXPORT SDImageCoderOption _Nonnull const SDImageCoderWebImageContext
182184
format:(SDImageFormat)format
183185
options:(nullable SDImageCoderOptions *)options;
184186

187+
#pragma mark - Animated Encoding
188+
@optional
189+
/**
190+
Encode the animated image frames to image data.
191+
192+
@param frames The animated image frames to be encoded, should be at least 1 element, or it will fallback to static image encode.
193+
@param loopCount The final animated image loop count. 0 means infinity loop. This config ignore each frame's `sd_imageLoopCount`
194+
@param format The image format to encode, you should note `SDImageFormatUndefined` format is also possible
195+
@param options A dictionary containing any encoding options. Pass @{SDImageCoderEncodeCompressionQuality: @(1)} to specify compression quality.
196+
@return The encoded image data
197+
*/
198+
- (nullable NSData *)encodedDataWithFrames:(nonnull NSArray<SDImageFrame *>*)frames
199+
loopCount:(NSUInteger)loopCount
200+
format:(SDImageFormat)format
201+
options:(nullable SDImageCoderOptions *)options;
185202
@end
186203

187204
#pragma mark - Progressive Coder

SDWebImage/Core/SDImageCodersManager.m

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,19 @@ - (NSData *)encodedDataWithImage:(UIImage *)image format:(SDImageFormat)format o
127127
return nil;
128128
}
129129

130+
- (NSData *)encodedDataWithFrames:(NSArray<SDImageFrame *> *)frames loopCount:(NSUInteger)loopCount format:(SDImageFormat)format options:(SDImageCoderOptions *)options {
131+
if (!frames || frames.count < 1) {
132+
return nil;
133+
}
134+
NSArray<id<SDImageCoder>> *coders = self.coders;
135+
for (id<SDImageCoder> coder in coders.reverseObjectEnumerator) {
136+
if ([coder canEncodeToFormat:format]) {
137+
if ([coder respondsToSelector:@selector(encodedDataWithFrames:loopCount:format:options:)]) {
138+
return [coder encodedDataWithFrames:frames loopCount:loopCount format:format options:options];
139+
}
140+
}
141+
}
142+
return nil;
143+
}
144+
130145
@end

SDWebImage/Core/SDImageFrame.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,21 @@
2424
*/
2525
@property (nonatomic, readonly, assign) NSTimeInterval duration;
2626

27+
/// Create a frame instance with specify image and duration
28+
/// @param image current frame's image
29+
/// @param duration current frame's duration
30+
- (nonnull instancetype)initWithImage:(nonnull UIImage *)image duration:(NSTimeInterval)duration;
31+
2732
/**
2833
Create a frame instance with specify image and duration
2934
3035
@param image current frame's image
3136
@param duration current frame's duration
3237
@return frame instance
3338
*/
34-
+ (instancetype _Nonnull)frameWithImage:(UIImage * _Nonnull)image duration:(NSTimeInterval)duration;
39+
+ (nonnull instancetype)frameWithImage:(nonnull UIImage *)image duration:(NSTimeInterval)duration;
40+
41+
- (nonnull instancetype)init NS_UNAVAILABLE;
42+
+ (nonnull instancetype)new NS_UNAVAILABLE;
3543

3644
@end

SDWebImage/Core/SDImageFrame.m

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,17 @@ @interface SDImageFrame ()
1717

1818
@implementation SDImageFrame
1919

20+
- (instancetype)initWithImage:(UIImage *)image duration:(NSTimeInterval)duration {
21+
self = [super init];
22+
if (self) {
23+
_image = image;
24+
_duration = duration;
25+
}
26+
return self;
27+
}
28+
2029
+ (instancetype)frameWithImage:(UIImage *)image duration:(NSTimeInterval)duration {
21-
SDImageFrame *frame = [[SDImageFrame alloc] init];
22-
frame.image = image;
23-
frame.duration = duration;
24-
30+
SDImageFrame *frame = [[SDImageFrame alloc] initWithImage:image duration:duration];
2531
return frame;
2632
}
2733

SDWebImage/Core/SDImageIOAnimatedCoder.m

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -555,19 +555,31 @@ - (NSData *)encodedDataWithImage:(UIImage *)image format:(SDImageFormat)format o
555555
if (!image) {
556556
return nil;
557557
}
558-
CGImageRef imageRef = image.CGImage;
559-
if (!imageRef) {
560-
// Earily return, supports CGImage only
558+
if (format != self.class.imageFormat) {
561559
return nil;
562560
}
563561

564-
if (format != self.class.imageFormat) {
562+
NSArray<SDImageFrame *> *frames = [SDImageCoderHelper framesFromAnimatedImage:image];
563+
if (!frames || frames.count == 0) {
564+
SDImageFrame *frame = [SDImageFrame frameWithImage:image duration:0];
565+
frames = @[frame];
566+
}
567+
return [self encodedDataWithFrames:frames loopCount:image.sd_imageLoopCount format:format options:options];
568+
}
569+
570+
- (NSData *)encodedDataWithFrames:(NSArray<SDImageFrame *> *)frames loopCount:(NSUInteger)loopCount format:(SDImageFormat)format options:(SDImageCoderOptions *)options {
571+
UIImage *image = frames.firstObject.image; // Primary image
572+
if (!image) {
573+
return nil;
574+
}
575+
CGImageRef imageRef = image.CGImage;
576+
if (!imageRef) {
577+
// Earily return, supports CGImage only
565578
return nil;
566579
}
567580

568581
NSMutableData *imageData = [NSMutableData data];
569582
CFStringRef imageUTType = [NSData sd_UTTypeFromImageFormat:format];
570-
NSArray<SDImageFrame *> *frames = [SDImageCoderHelper framesFromAnimatedImage:image];
571583

572584
// Create an image destination. Animated Image does not support EXIF image orientation TODO
573585
// The `CGImageDestinationCreateWithData` will log a warning when count is 0, use 1 instead.
@@ -630,12 +642,11 @@ - (NSData *)encodedDataWithImage:(UIImage *)image format:(SDImageFormat)format o
630642
properties[(__bridge NSString *)kCGImageDestinationEmbedThumbnail] = @(embedThumbnail);
631643

632644
BOOL encodeFirstFrame = [options[SDImageCoderEncodeFirstFrameOnly] boolValue];
633-
if (encodeFirstFrame || frames.count == 0) {
645+
if (encodeFirstFrame || frames.count <= 1) {
634646
// for static single images
635647
CGImageDestinationAddImage(imageDestination, imageRef, (__bridge CFDictionaryRef)properties);
636648
} else {
637649
// for animated images
638-
NSUInteger loopCount = image.sd_imageLoopCount;
639650
NSDictionary *containerProperties = @{
640651
self.class.dictionaryProperty: @{self.class.loopCountProperty : @(loopCount)}
641652
};

0 commit comments

Comments
 (0)