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

faster gif save if interpalette-maxerror is huge

Browse Source 
If interpalette-maxerror is very large, we don't need to recompute the
palette for every frame, since we'll never choose a new palette.
This commit is contained in:
John Cupitt 2022-11-07 16:49:12 +00:00
parent 3ebb21491d
commit 557fc76634
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
libvips/foreign/cgifsave.c
View File

@ -300,8 +300,6 @@ vips_foreign_save_cgif_get_rgb_palette( VipsForeignSaveCgif *cgif,
} }
} }
/* Pick a quantiser for LOCAL mode.
*/
int int
vips_foreign_save_cgif_pick_quantiser( VipsForeignSaveCgif *cgif, vips_foreign_save_cgif_pick_quantiser( VipsForeignSaveCgif *cgif,
VipsQuantiseImage *image, VipsQuantiseImage *image,
@ -317,7 +315,7 @@ vips_foreign_save_cgif_pick_quantiser( VipsForeignSaveCgif *cgif,
return( -1 ); return( -1 );
} }
/* No global quantiser set up yet? Use this. /* No global quantiser set up yet? Use this result.
*/ */
if( !cgif->quantisation_result ) { if( !cgif->quantisation_result ) {
#ifdef DEBUG_VERBOSE #ifdef DEBUG_VERBOSE
@ -342,8 +340,9 @@ vips_foreign_save_cgif_pick_quantiser( VipsForeignSaveCgif *cgif,
const VipsQuantisePalette *prev = vips__quantise_get_palette( const VipsQuantisePalette *prev = vips__quantise_get_palette(
cgif->previous_quantisation_result ); cgif->previous_quantisation_result );
double global_diff = vips__cgif_compare_palettes( this, global ); double global_diff =
double prev_diff = ( prev == global ) ? global_diff : vips__cgif_compare_palettes( this, global );
double prev_diff = (prev == global) ? global_diff :
vips__cgif_compare_palettes( this, prev ); vips__cgif_compare_palettes( this, prev );
#ifdef DEBUG_VERBOSE #ifdef DEBUG_VERBOSE
@ -472,21 +471,18 @@ vips_foreign_save_cgif_write_frame( VipsForeignSaveCgif *cgif )
image = vips__quantise_image_create_rgba( cgif->attr, image = vips__quantise_image_create_rgba( cgif->attr,
cgif->frame_bytes, cgif->frame_width, cgif->frame_height, 0 ); cgif->frame_bytes, cgif->frame_width, cgif->frame_height, 0 );
/* Quantise. if( cgif->mode == VIPS_FOREIGN_SAVE_CGIF_MODE_LOCAL ||
*/ !cgif->quantisation_result ) {
if( cgif->mode == VIPS_FOREIGN_SAVE_CGIF_MODE_GLOBAL ) { /* Reoptimising each frame, or no global palette set up yet.
/* Global mode: use the global palette.
*/
quantisation_result = cgif->quantisation_result;
use_local = FALSE;
}
else {
/* Local mode. Pick the global, this or previous palette.
*/ */
if( vips_foreign_save_cgif_pick_quantiser( cgif, if( vips_foreign_save_cgif_pick_quantiser( cgif,
image, &quantisation_result, &use_local ) ) image, &quantisation_result, &use_local ) )
return( -1 ); return( -1 );
} }
else {
quantisation_result = cgif->quantisation_result;
use_local = FALSE;
}
lp = vips__quantise_get_palette( quantisation_result ); lp = vips__quantise_get_palette( quantisation_result );
/* If there's a transparent pixel, it's always first. /* If there's a transparent pixel, it's always first.
@ -700,17 +696,19 @@ vips_foreign_save_cgif_build( VipsObject *object )
/* Set up libimagequant. /* Set up libimagequant.
*/ */
cgif->attr = vips__quantise_attr_create(); cgif->attr = vips__quantise_attr_create();
/* Limit the number of colours to 255, so there is always one index /* Limit the number of colours to 255 so there is always one index
* free for the transparency optimization. * free for transparency optimization.
*/ */
vips__quantise_set_max_colors( cgif->attr, vips__quantise_set_max_colors( cgif->attr,
VIPS_MIN( 255, 1 << cgif->bitdepth ) ); VIPS_MIN( 255, 1 << cgif->bitdepth ) );
vips__quantise_set_quality( cgif->attr, 0, 100 ); vips__quantise_set_quality( cgif->attr, 0, 100 );
vips__quantise_set_speed( cgif->attr, 11 - cgif->effort ); vips__quantise_set_speed( cgif->attr, 11 - cgif->effort );
/* Read the palette on the input, if any. /* Read the palette on the input if we've not been asked to
* reoptimise.
*/ */
if( vips_image_get_typeof( cgif->in, "gif-palette" ) ) { if( !cgif->reoptimise &&
vips_image_get_typeof( cgif->in, "gif-palette" ) ) {
if( vips_image_get_array_int( cgif->in, "gif-palette", if( vips_image_get_array_int( cgif->in, "gif-palette",
&cgif->palette, &cgif->n_colours ) ) &cgif->palette, &cgif->n_colours ) )
return( -1 ); return( -1 );
@ -722,17 +720,7 @@ vips_foreign_save_cgif_build( VipsObject *object )
} }
} }
/* LOCAL mode if there's no input palette, or reoptimise is set. if( cgif->palette ) {
*/
if( cgif->reoptimise ||
!cgif->palette )
cgif->mode = VIPS_FOREIGN_SAVE_CGIF_MODE_LOCAL;
/* Set up GLOBAL mode. Init the quantisation_result we will
* use to dither frames with a fixed palette taken from the input
* image.
*/
if( cgif->mode == VIPS_FOREIGN_SAVE_CGIF_MODE_GLOBAL ) {
/* Make a fake image from the input palette, and quantise that. /* Make a fake image from the input palette, and quantise that.
* Add a zero pixel (transparent) in case the input image has * Add a zero pixel (transparent) in case the input image has
* transparency. * transparency.
@ -758,6 +746,15 @@ vips_foreign_save_cgif_build( VipsObject *object )
VIPS_FREEF( vips__quantise_image_destroy, image ); VIPS_FREEF( vips__quantise_image_destroy, image );
} }
/* Global mode if there's an input palette, or palette maxerror is
* huge.
*/
if( cgif->palette ||
cgif->interpalette_maxerror > 255 )
cgif->mode = VIPS_FOREIGN_SAVE_CGIF_MODE_GLOBAL;
else
cgif->mode = VIPS_FOREIGN_SAVE_CGIF_MODE_LOCAL;
if( vips_sink_disc( cgif->in, if( vips_sink_disc( cgif->in,
vips_foreign_save_cgif_sink_disc, cgif ) ) vips_foreign_save_cgif_sink_disc, cgif ) )
return( -1 ); return( -1 );