@@ -310,8 +310,8 @@ static void v4l_print_format(const void *arg, bool write_only)
310310 case V4L2_BUF_TYPE_VIDEO_OVERLAY :
311311 case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY :
312312 win = & p -> fmt .win ;
313- pr_cont (", wxh=%dx%d, x,y=%d,%d , field=%s, chromakey=0x%08x, global_alpha=0x%02x\n" ,
314- win -> w .width , win -> w .height , win -> w .left , win -> w .top ,
313+ pr_cont (", (%d,%d)/%ux%u , field=%s, chromakey=0x%08x, global_alpha=0x%02x\n" ,
314+ win -> w .left , win -> w .top , win -> w .width , win -> w .height ,
315315 prt_names (win -> field , v4l2_field_names ),
316316 win -> chromakey , win -> global_alpha );
317317 break ;
@@ -589,33 +589,33 @@ static void v4l_print_cropcap(const void *arg, bool write_only)
589589{
590590 const struct v4l2_cropcap * p = arg ;
591591
592- pr_cont ("type=%s, bounds wxh=%dx%d, x,y=%d,%d , defrect wxh=%dx%d, x,y=%d,%d , pixelaspect %d/%d\n" ,
592+ pr_cont ("type=%s, bounds (%d,%d)/%ux%u , defrect (%d,%d)/%ux%u , pixelaspect %d/%d\n" ,
593593 prt_names (p -> type , v4l2_type_names ),
594- p -> bounds .width , p -> bounds .height ,
595594 p -> bounds .left , p -> bounds .top ,
596- p -> defrect .width , p -> defrect .height ,
595+ p -> bounds .width , p -> bounds .height ,
597596 p -> defrect .left , p -> defrect .top ,
597+ p -> defrect .width , p -> defrect .height ,
598598 p -> pixelaspect .numerator , p -> pixelaspect .denominator );
599599}
600600
601601static void v4l_print_crop (const void * arg , bool write_only )
602602{
603603 const struct v4l2_crop * p = arg ;
604604
605- pr_cont ("type=%s, wxh=%dx%d, x,y=%d,%d \n" ,
605+ pr_cont ("type=%s, crop=(%d,%d)/%ux%u \n" ,
606606 prt_names (p -> type , v4l2_type_names ),
607- p -> c .width , p -> c .height ,
608- p -> c .left , p -> c .top );
607+ p -> c .left , p -> c .top ,
608+ p -> c .width , p -> c .height );
609609}
610610
611611static void v4l_print_selection (const void * arg , bool write_only )
612612{
613613 const struct v4l2_selection * p = arg ;
614614
615- pr_cont ("type=%s, target=%d, flags=0x%x, wxh=%dx%d, x,y=%d,%d \n" ,
615+ pr_cont ("type=%s, target=%d, flags=0x%x, rect=(%d,%d)/%ux%u \n" ,
616616 prt_names (p -> type , v4l2_type_names ),
617617 p -> target , p -> flags ,
618- p -> r .width , p -> r .height , p -> r .left , p -> r .top );
618+ p -> r .left , p -> r .top , p -> r .width , p -> r .height );
619619}
620620
621621static void v4l_print_jpegcompression (const void * arg , bool write_only )
0 commit comments