Merge pull request #59 from pushd/imgproxy_update

FRAM-794  HEIC saving support

Author: viralauraframes

CHANGELOG.md

@@ -1,6 +1,36 @@
 # Changelog
 
 ## [Unreleased]
+### Add
+- Add `status_codes_total` counter to Prometheus metrics.
+- Add client-side decryprion support for S3 integration.
+- Add HEIC saving support.
+- (pro) Add the `IMGPROXY_VIDEO_THUMBNAIL_KEYFRAMES` config and the [video_thumbnail_keyframes](https://docs.imgproxy.net/latest/generating_the_url?id=video-thumbnail-keyframes) processing option.
+- (pro) Add the [video_thumbnail_tile](https://docs.imgproxy.net/latest/generating_the_url?id=video-thumbnail-tile) processing option.
+- (pro) Add the `duration` field to the video streams information in the `/info` endpoint response.
+
+### Fix
+- (pro) Fix detection of some videos.
+- (pro) Fix headers and cookies passthrough when the source is a video.
+- (pro) Fix wrong behavior of the `background_alpha` option when the `best` format is used.
+- (docker) Fix saving EXIF strings containing invalid UTF-8 characters.
+- (docker) Fix possible segfaults while processing HEIC/AVIF images.
+- (docker) Fix rendering GIFs embedded in SVGs.
+
+## [3.20.0] - 2023-10-09
+### Add
+- (pro) Add [info options](https://docs.imgproxy.net/latest/getting_the_image_info?id=info-options) support to the `/info` endpoint.
+- (pro) Add video streams info to the `/info` endpoint response.
+- (docker) Add support for TIFFs with 16-bit float samples.
+- (docker) Add support for TIFFs with the old-style JPEG compression.
+
+### Change
+- Limit vector image sizes to `IMGPROXY_MAX_SRC_RESOLUTION`.
+- (pro) Respect image orientation when extracting image dimensions for the `/info` endpoint response.
+- (pro) Respect `IMGPROXY_WORKERS` and `IMGPROXY_REQUESTS_QUEUE_SIZE` configs in the `/info` endpoint.
+- (pro) Collect detailed metrics for the `/info` endpoint.
+- (docker) Invalid UTF-8 strings in image metadata are fixed instead of being ignored.
+
 ### Fix
 - Fix parsing of HEIF files with large boxes.
 - Fix wrong colors when the source image has a linear colorspace.

imagetype/imagetype.go

@@ -147,9 +147,18 @@ func (it Type) SupportsColourProfile() bool {
 	return it == JPEG ||
 		it == PNG ||
 		it == WEBP ||
+		it == HEIC ||
 		it == AVIF
 }
 
+func (it Type) SupportsQuality() bool {
+	return it == JPEG ||
+		it == WEBP ||
+		it == HEIC ||
+		it == AVIF ||
+		it == TIFF
+}
+
 func (it Type) SupportsThumbnail() bool {
 	return it == HEIC || it == AVIF
 }

processing/processing.go

@@ -86,15 +86,6 @@ func ValidatePreferredFormats() error {
 	return nil
 }
 
-func canFitToBytes(imgtype imagetype.Type) bool {
-	switch imgtype {
-	case imagetype.JPEG, imagetype.WEBP, imagetype.AVIF, imagetype.TIFF:
-		return true
-	default:
-		return false
-	}
-}
-
 func getImageSize(img *vips.Image) (int, int) {
 	width, height, _, _ := extractMeta(img, 0, true)
 
@@ -334,7 +325,7 @@ func ProcessImage(ctx context.Context, imgdata *imagedata.ImageData, po *options
 		err     error
 	)
 
-	if po.MaxBytes > 0 && canFitToBytes(po.Format) {
+	if po.MaxBytes > 0 && po.Format.SupportsQuality() {
 		outData, err = saveImageToFitBytes(ctx, po, img)
 	} else {
 		outData, err = img.Save(po.Format, po.GetQuality())

vips/vips.c

@@ -919,7 +919,18 @@ vips_tiffsave_go(VipsImage *in, void **buf, size_t *len, int quality) {
 }
 
 int
-vips_avifsave_go(VipsImage *in, void **buf, size_t *len, int quality, int speed) {
+vips_heifsave_go(VipsImage *in, void **buf, size_t *len, int quality)
+{
+  return vips_heifsave_buffer(
+      in, buf, len,
+      "Q", quality,
+      "compression", VIPS_FOREIGN_HEIF_COMPRESSION_HEVC,
+      NULL);
+}
+
+int
+vips_avifsave_go(VipsImage *in, void **buf, size_t *len, int quality, int speed)
+{
   return vips_heifsave_buffer(
     in, buf, len,
     "Q", quality,

vips/vips.go

@@ -247,7 +247,7 @@ func SupportsSave(it imagetype.Type) bool {
 		sup = hasOperation("webpsave_buffer")
 	case imagetype.GIF:
 		sup = hasOperation("gifsave_buffer")
-	case imagetype.AVIF:
+	case imagetype.HEIC, imagetype.AVIF:
 		sup = hasOperation("heifsave_buffer")
 	case imagetype.BMP:
 		sup = true
@@ -404,6 +404,8 @@ func (img *Image) Save(imgtype imagetype.Type, quality int) (*imagedata.ImageDat
 		err = C.vips_webpsave_go(img.VipsImage, &ptr, &imgsize, C.int(quality))
 	case imagetype.GIF:
 		err = C.vips_gifsave_go(img.VipsImage, &ptr, &imgsize)
+	case imagetype.HEIC:
+		err = C.vips_heifsave_go(img.VipsImage, &ptr, &imgsize, C.int(quality))
 	case imagetype.AVIF:
 		err = C.vips_avifsave_go(img.VipsImage, &ptr, &imgsize, C.int(quality), vipsConf.AvifSpeed)
 	case imagetype.TIFF:

vips/vips.h

@@ -97,6 +97,7 @@ int vips_pngsave_go(VipsImage *in, void **buf, size_t *len, int interlace, int q
     int colors);
 int vips_webpsave_go(VipsImage *in, void **buf, size_t *len, int quality);
 int vips_gifsave_go(VipsImage *in, void **buf, size_t *len);
+int vips_heifsave_go(VipsImage *in, void **buf, size_t *len, int quality);
 int vips_avifsave_go(VipsImage *in, void **buf, size_t *len, int quality, int speed);
 int vips_tiffsave_go(VipsImage *in, void **buf, size_t *len, int quality);