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

Speed up the mask construction for uchar/ushort images

Browse Source 
By not calling vips_vector_to_fixed_point repeatedly.
This commit is contained in:
Kleis Auke Wolthuizen 2020-06-06 14:12:37 +02:00
parent ac358ff4b8
commit b6e4e9e74b
1 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
libvips/resample/reducev.cpp
View File

@ -20,6 +20,7 @@
* 6/6/20 kleisauke * 6/6/20 kleisauke
* - deprecate @centre option, it's now always on * - deprecate @centre option, it's now always on
* - fix pixel shift * - fix pixel shift
* - speed up the mask construction for uchar/ushort images
*/ */
/* /*
@ -737,41 +738,7 @@ vips_reducev_raw( VipsReducev *reducev, VipsImage *in, VipsImage **out )
VipsGenerateFn generate; VipsGenerateFn generate;
/* Build masks. /* We need an 2.6 version if we will use the vector path.
*/
for( int y = 0; y < VIPS_TRANSFORM_SCALE + 1; y++ ) {
reducev->matrixf[y] =
VIPS_ARRAY( NULL, reducev->n_point, double );
if( !reducev->matrixf[y] )
return( -1 );
vips_reduce_make_mask( reducev->matrixf[y],
reducev->kernel, reducev->vshrink,
(float) y / VIPS_TRANSFORM_SCALE );
#ifdef DEBUG
printf( "%6.2g", (double) y / VIPS_TRANSFORM_SCALE );
for( int i = 0; i < reducev->n_point; i++ )
printf( ", %6.2g", reducev->matrixf[y][i] );
printf( "\n" );
#endif /*DEBUG*/
}
/* uchar and ushort need an int version of the masks.
*/
if( VIPS_IMAGE_SIZEOF_ELEMENT( in ) <= 2 )
for( int y = 0; y < VIPS_TRANSFORM_SCALE + 1; y++ ) {
reducev->matrixi[y] =
VIPS_ARRAY( NULL, reducev->n_point, int );
if( !reducev->matrixi[y] )
return( -1 );
vips_vector_to_fixed_point(
reducev->matrixf[y], reducev->matrixi[y],
reducev->n_point, VIPS_INTERPOLATE_SCALE );
}
/* And we need an 2.6 version if we will use the vector path.
*/ */
if( in->BandFmt == VIPS_FORMAT_UCHAR && if( in->BandFmt == VIPS_FORMAT_UCHAR &&
vips_vector_isenabled() ) vips_vector_isenabled() )
@ -885,6 +852,33 @@ vips_reducev_build( VipsObject *object )
*/ */
reducev->voffset = (1 + extra_pixels) / 2.0; reducev->voffset = (1 + extra_pixels) / 2.0;
/* Build the tables of pre-computed coefficients.
*/
for( int y = 0; y < VIPS_TRANSFORM_SCALE + 1; y++ ) {
reducev->matrixf[y] =
VIPS_ARRAY( NULL, reducev->n_point, double );
reducev->matrixi[y] =
VIPS_ARRAY( NULL, reducev->n_point, int );
if( !reducev->matrixf[y] ||
!reducev->matrixi[y] )
return( -1 );
vips_reduce_make_mask( reducev->matrixf[y],
reducev->kernel, reducev->vshrink,
(float) y / VIPS_TRANSFORM_SCALE );
for( int i = 0; i < reducev->n_point; i++ )
reducev->matrixi[y][i] = reducev->matrixf[y][i] *
VIPS_INTERPOLATE_SCALE;
#ifdef DEBUG
printf( "vips_reducev_build: mask %d\n ", y );
for( int i = 0; i < reducev->n_point; i++ )
printf( "%d ", reducev->matrixi[y][i] );
printf( "\n" );
#endif /*DEBUG*/
}
/* Unpack for processing. /* Unpack for processing.
*/ */
if( vips_image_decode( in, &t[0] ) ) if( vips_image_decode( in, &t[0] ) )