@ -968,106 +968,125 @@ screenshot_reference_filename(const char *basename, uint32_t seq)
} }
/**
/**
* check_surfaces_geometry ( ) - verifies two surfaces are same size * Compute the ROI for image comparisons
* *
* @ returns true if surfaces have the same width and height , or false * \ param img_a An image .
* if not , or if there is no actual data . * \ param img_b Another image .
* \ param clip_rect Explicit ROI , or NULL for using the whole
* image area .
*
* \ return The region of interest ( ROI ) that is guaranteed to be inside both
* images .
*
* If clip_rect is given , it must fall inside of both images .
* If clip_rect is NULL , the images must be of the same size .
* If any precondition is violated , this function aborts with an error .
*
* The ROI is given as pixman_box32_t , where x2 , y2 are non - inclusive .
*/ */
bool static pixman_box32_t
check_surfaces_geometry ( const struct surface * a , const struct surface * b ) image_check_get_roi ( pixman_image_t * img_a , pixman_image_t * img_b ,
const struct rectangle * clip_rect )
{ {
if ( a = = NULL | | b = = NULL ) { int width_a ;
printf ( " Undefined surfaces \n " ) ; int width_b ;
return false ; int height_a ;
} int height_b ;
else if ( a - > buffer = = NULL | | b - > buffer = = NULL ) { pixman_box32_t box ;
printf ( " Undefined data \n " ) ;
return false ; width_a = pixman_image_get_width ( img_a ) ;
} height_a = pixman_image_get_height ( img_a ) ;
else if ( a - > width ! = b - > width | | a - > height ! = b - > height ) {
printf ( " Mismatched dimensions: %d,%d != %d,%d \n " , width_b = pixman_image_get_width ( img_b ) ;
a - > width , a - > height , b - > width , b - > height ) ; height_b = pixman_image_get_height ( img_b ) ;
return false ;
if ( clip_rect ) {
box . x1 = clip_rect - > x ;
box . y1 = clip_rect - > y ;
box . x2 = clip_rect - > x + clip_rect - > width ;
box . y2 = clip_rect - > y + clip_rect - > height ;
} else {
box . x1 = 0 ;
box . y1 = 0 ;
box . x2 = max ( width_a , width_b ) ;
box . y2 = max ( height_a , height_b ) ;
} }
return true ;
assert ( box . x1 > = 0 ) ;
assert ( box . y1 > = 0 ) ;
assert ( box . x2 > box . x1 ) ;
assert ( box . y2 > box . y1 ) ;
assert ( box . x2 < = width_a ) ;
assert ( box . x2 < = width_b ) ;
assert ( box . y2 < = height_a ) ;
assert ( box . y2 < = height_b ) ;
return box ;
} }
/**
struct image_iterator {
* check_surfaces_equal ( ) - tests if two surfaces are pixel - identical char * data ;
* int stride ; /* bytes */
* Returns true if surface buffers have all the same byte values , } ;
* false if the surfaces don ' t match or can ' t be compared due to
* different dimensions . static void
*/ image_iter_init ( struct image_iterator * it , pixman_image_t * image )
bool
check_surfaces_equal ( const struct surface * a , const struct surface * b )
{ {
int bpp = 4 ; /* Assumes ARGB */ pixman_format_code_t fmt ;
void * data_a ;
void * data_b ;
if ( ! check_surfaces_geometry ( a , b ) ) it - > stride = pixman_image_get_stride ( image ) ;
return false ; it - > data = ( void * ) pixman_image_get_data ( image ) ;
data_a = pixman_image_get_data ( a - > buffer - > image ) ; fmt = pixman_image_get_format ( image ) ;
data_b = pixman_image_get_data ( b - > buffer - > image ) ; assert ( PIXMAN_FORMAT_BPP ( fmt ) = = 32 ) ;
}
return ( memcmp ( data_a , data_b , bpp * a - > width * a - > height ) = = 0 ) ; static uint32_t *
image_iter_get_row ( struct image_iterator * it , int y )
{
return ( uint32_t * ) ( it - > data + y * it - > stride ) ;
} }
/**
/**
* check_surfaces_match_in_clip ( ) - tests if a given region within two * Test if a given region within two images are pixel - identical .
* surfaces are pixel - identical . *
* Returns true if the two images pixel - wise identical , and false otherwise .
* *
* Returns true if the two surfaces have the same byte values within the * \ param img_a First image .
* given clipping region , or false if they don ' t match or the surfaces * \ param img_b Second image .
* can ' t be compared . * \ param clip_rect The region of interest , or NULL for comparing the whole
* images .
*
* This function hard - fails if clip_rect is not inside both images . If clip_rect
* is given , the images do not have to match in size , otherwise size mismatch
* will be a hard failure .
*/ */
bool bool
check_surfaces_match_in_clip ( const struct surface * a , const struct surface * b , const struct rectangle * clip_rect ) check_images_match ( pixman_image_t * img_a , pixman_image_t * img_b ,
const struct rectangle * clip_rect )
{ {
int i , j ; struct image_iterator it_a ;
int x0 , y0 , x1 , y1 ; struct image_iterator it_b ;
void * p , * q ; pixman_box32_t box ;
int bpp = 4 ; /* Assumes ARGB */ int x , y ;
void * data_a ; uint32_t * pix_a ;
void * data_b ; uint32_t * pix_b ;
if ( ! check_surfaces_geometry ( a , b ) | | clip_rect = = NULL )
return false ;
if ( clip_rect - > x > a - > width | | clip_rect - > y > a - > height ) { box = image_check_get_roi ( img_a , img_b , clip_rect ) ;
printf ( " Clip outside image boundaries \n " ) ;
return true ;
}
x0 = max ( 0 , clip_rect - > x ) ; image_iter_init ( & it_a , img_a ) ;
y0 = max ( 0 , clip_rect - > y ) ; image_iter_init ( & it_b , img_b ) ;
x1 = min ( a - > width , clip_rect - > x + clip_rect - > width ) ;
y1 = min ( a - > height , clip_rect - > y + clip_rect - > height ) ;
if ( x0 = = x1 | | y0 = = y1 ) { for ( y = box . y1 ; y < box . y2 ; y + + ) {
printf ( " Degenerate comparison \n " ) ; pix_a = image_iter_get_row ( & it_a , y ) + box . x1 ;
return true ; pix_b = image_iter_get_row ( & it_b , y ) + box . x1 ;
}
data_a = pixman_image_get_data ( a - > buffer - > image ) ; for ( x = box . x1 ; x < box . x2 ; x + + ) {
data_b = pixman_image_get_data ( b - > buffer - > image ) ; if ( * pix_a ! = * pix_b )
printf ( " Bytewise comparison inside clip \n " ) ;
for ( i = y0 ; i < y1 ; i + + ) {
p = data_a + i * a - > width * bpp + x0 * bpp ;
q = data_b + i * b - > width * bpp + x0 * bpp ;
if ( memcmp ( p , q , ( x1 - x0 ) * bpp ) ! = 0 ) {
/* Dump the bad row */
printf ( " Mismatched image on row %d \n " , i ) ;
for ( j = 0 ; j < ( x1 - x0 ) * bpp ; j + + ) {
char a_char = * ( ( char * ) ( p + j * bpp ) ) ;
char b_char = * ( ( char * ) ( q + j * bpp ) ) ;
printf ( " %d,%d: %8x %8x %s \n " , i , j , a_char , b_char ,
( a_char ! = b_char ) ? " <--- " : " " ) ;
}
return false ; return false ;
pix_a + + ;
pix_b + + ;
} }
} }
Pekka Paalanen
9 years ago