Skip to content

Support 10bit 12bit HEIF HDR images #9

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

Merged
merged 1 commit into from
Apr 15, 2019
Merged

Support 10bit 12bit HEIF HDR images #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions SDWebImageHEIFCoder/Classes/SDImageHEIFCoder.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ static heif_error WriteImageData(heif_context * ctx, const void * data, size_t s
return error;
}

static void FreeImageData(void *info, const void *data, size_t size) {
free((void *)data);
}

@implementation SDImageHEIFCoder

+ (instancetype)sharedCoder {
Expand Down Expand Up @@ -109,8 +113,23 @@ - (nullable CGImageRef)sd_createHEIFImageWithData:(nonnull NSData *)data CF_RETU
}

// check alpha channel
bool hasAlpha = heif_image_handle_has_alpha_channel(handle);
heif_chroma chroma = hasAlpha ? heif_chroma_interleaved_32bit : heif_chroma_interleaved_24bit;
BOOL hasAlpha = heif_image_handle_has_alpha_channel(handle);
int depth = heif_image_handle_get_chroma_bits_per_pixel(handle);
BOOL hasHighDepth = depth > 8;
heif_chroma chroma;
if (hasAlpha) {
if (hasHighDepth) {
chroma = heif_chroma_interleaved_RRGGBB_BE;
} else {
chroma = heif_chroma_interleaved_RGBA;
}
} else {
if (hasHighDepth) {
chroma = heif_chroma_interleaved_RRGGBBAA_BE;
} else {
chroma = heif_chroma_interleaved_RGB;
}
}

// decode the image and convert colorspace to RGB/RGBA, saved as 24bit/32bit interleaved
heif_image* img;
Expand All @@ -125,7 +144,7 @@ - (nullable CGImageRef)sd_createHEIFImageWithData:(nonnull NSData *)data CF_RETU
width = heif_image_get_width(img, heif_channel_interleaved);
height = heif_image_get_height(img, heif_channel_interleaved);
bitsPerPixel = heif_image_get_bits_per_pixel(img, heif_channel_interleaved);
bitsPerComponent = 8;
bitsPerComponent = hasHighDepth ? 16 : 8;
CGBitmapInfo bitmapInfo = kCGBitmapByteOrderDefault;
bitmapInfo |= hasAlpha ? kCGImageAlphaPremultipliedLast : kCGImageAlphaNone;

Expand All @@ -137,7 +156,7 @@ - (nullable CGImageRef)sd_createHEIFImageWithData:(nonnull NSData *)data CF_RETU
return nil;
}
CGDataProviderRef provider =
CGDataProviderCreateWithData(NULL, rgba, stride * height, NULL);
CGDataProviderCreateWithData(NULL, rgba, stride * height, FreeImageData);

CGColorSpaceRef colorSpaceRef = [SDImageCoderHelper colorSpaceGetDeviceRGB];
CGColorRenderingIntent renderingIntent = kCGRenderingIntentDefault;
Expand Down