sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libheif: expose speed parameter (currently AV1 compression only)

Browse Source 
Supports both aom and rav1e encoders by limiting to a 0-8 range.

(The rav1e encoder accepts speed values of 9 and 10 but these
use 64x64 blocks more suited to video than images.)
This commit is contained in:
Lovell Fuller 2020-09-16 19:22:45 +01:00
parent a88c88bb7b
commit 2403b29c1f
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libvips/foreign/heifsave.c
View File

@ -79,6 +79,10 @@ typedef struct _VipsForeignSaveHeif {
*/ */
VipsForeignHeifCompression compression; VipsForeignHeifCompression compression;
/* CPU effort (0-8).
*/
int speed;
/* The image we save. This is a copy of save->ready since we need to /* The image we save. This is a copy of save->ready since we need to
* be able to update the metadata. * be able to update the metadata.
*/ */
@ -351,6 +355,14 @@ vips_foreign_save_heif_build( VipsObject *object )
return( -1 ); return( -1 );
} }
error = heif_encoder_set_parameter_integer( heif->encoder,
"speed", heif->speed );
if( error.code &&
error.subcode != heif_suberror_Unsupported_parameter ) {
vips__heif_error( &error );
return( -1 );
}
/* TODO .. support extra per-encoder params with /* TODO .. support extra per-encoder params with
* heif_encoder_list_parameters(). * heif_encoder_list_parameters().
*/ */
@ -458,6 +470,13 @@ vips_foreign_save_heif_class_init( VipsForeignSaveHeifClass *class )
VIPS_TYPE_FOREIGN_HEIF_COMPRESSION, VIPS_TYPE_FOREIGN_HEIF_COMPRESSION,
VIPS_FOREIGN_HEIF_COMPRESSION_HEVC ); VIPS_FOREIGN_HEIF_COMPRESSION_HEVC );
VIPS_ARG_INT( class, "speed", 15,
_( "speed" ),
_( "CPU effort" ),
VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsForeignSaveHeif, speed ),
0, 8, 5 );
} }
static void static void
@ -466,6 +485,7 @@ vips_foreign_save_heif_init( VipsForeignSaveHeif *heif )
heif->ctx = heif_context_alloc(); heif->ctx = heif_context_alloc();
heif->Q = 50; heif->Q = 50;
heif->compression = VIPS_FOREIGN_HEIF_COMPRESSION_HEVC; heif->compression = VIPS_FOREIGN_HEIF_COMPRESSION_HEVC;
heif->speed = 5;
} }
typedef struct _VipsForeignSaveHeifFile { typedef struct _VipsForeignSaveHeifFile {
@ -658,6 +678,7 @@ vips_foreign_save_heif_target_init( VipsForeignSaveHeifTarget *target )
* * @Q: %gint, quality factor * * @Q: %gint, quality factor
* * @lossless: %gboolean, enable lossless encoding * * @lossless: %gboolean, enable lossless encoding
* * @compression: #VipsForeignHeifCompression, write with this compression * * @compression: #VipsForeignHeifCompression, write with this compression
* * @speed: %gint, CPU effort, 0 slowest - 8 fastest, AV1 compression only
* *
* Write a VIPS image to a file in HEIF format. * Write a VIPS image to a file in HEIF format.
* *
@ -668,6 +689,9 @@ vips_foreign_save_heif_target_init( VipsForeignSaveHeifTarget *target )
* *
* Use @compression to set the encoder e.g. HEVC, AVC, AV1 * Use @compression to set the encoder e.g. HEVC, AVC, AV1
* *
* Use @speed to control the CPU effort spent improving compression.
* This is currently only applicable to AV1 encoders, defaults to 5.
*
* See also: vips_image_write_to_file(), vips_heifload(). * See also: vips_image_write_to_file(), vips_heifload().
* *
* Returns: 0 on success, -1 on error. * Returns: 0 on success, -1 on error.
@ -697,6 +721,7 @@ vips_heifsave( VipsImage *in, const char *filename, ... )
* * @Q: %gint, quality factor * * @Q: %gint, quality factor
* * @lossless: %gboolean, enable lossless encoding * * @lossless: %gboolean, enable lossless encoding
* * @compression: #VipsForeignHeifCompression, write with this compression * * @compression: #VipsForeignHeifCompression, write with this compression
* * @speed: %gint, CPU effort, 0 slowest - 8 fastest, AV1 compression only
* *
* As vips_heifsave(), but save to a memory buffer. * As vips_heifsave(), but save to a memory buffer.
* *
@ -747,6 +772,7 @@ vips_heifsave_buffer( VipsImage *in, void **buf, size_t *len, ... )
* * @Q: %gint, quality factor * * @Q: %gint, quality factor
* * @lossless: %gboolean, enable lossless encoding * * @lossless: %gboolean, enable lossless encoding
* * @compression: #VipsForeignHeifCompression, write with this compression * * @compression: #VipsForeignHeifCompression, write with this compression
* * @speed: %gint, CPU effort, 0 slowest - 8 fastest, AV1 compression only
* *
* As vips_heifsave(), but save to a target. * As vips_heifsave(), but save to a target.
* *