mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-04-12 16:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: v4l2-core: use (t,l)/wxh format for rectangle

Browse Source 
Standardize reporting of rectangles to (t,l)/wxh.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Hans Verkuil 2025-03-03 11:31:38 +01:00 committed by Mauro Carvalho Chehab
parent 3851fdc360
commit 11340fbdc6
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/v4l2-core/v4l2-ctrls-core.c
View File

@ -437,9 +437,9 @@ void v4l2_ctrl_type_op_log(const struct v4l2_ctrl *ctrl)
pr_cont("AV1_FILM_GRAIN"); pr_cont("AV1_FILM_GRAIN");
break; break;
case V4L2_CTRL_TYPE_RECT: case V4L2_CTRL_TYPE_RECT:
pr_cont("%ux%u@%dx%d", pr_cont("(%d,%d)/%ux%u",
ptr.p_rect->width, ptr.p_rect->height, ptr.p_rect->left, ptr.p_rect->top,
ptr.p_rect->left, ptr.p_rect->top); ptr.p_rect->width, ptr.p_rect->height);
break; break;
default: default:
pr_cont("unknown type %d", ctrl->type); pr_cont("unknown type %d", ctrl->type);

20
drivers/media/v4l2-core/v4l2-ioctl.c
View File

@ -310,8 +310,8 @@ static void v4l_print_format(const void *arg, bool write_only)
case V4L2_BUF_TYPE_VIDEO_OVERLAY: case V4L2_BUF_TYPE_VIDEO_OVERLAY:
case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
win = &p->fmt.win; win = &p->fmt.win;
pr_cont(", wxh=%dx%d, x,y=%d,%d, field=%s, chromakey=0x%08x, global_alpha=0x%02x\n", pr_cont(", (%d,%d)/%ux%u, field=%s, chromakey=0x%08x, global_alpha=0x%02x\n",
win->w.width, win->w.height, win->w.left, win->w.top, win->w.left, win->w.top, win->w.width, win->w.height,
prt_names(win->field, v4l2_field_names), prt_names(win->field, v4l2_field_names),
win->chromakey, win->global_alpha); win->chromakey, win->global_alpha);
break; break;
@ -589,12 +589,12 @@ static void v4l_print_cropcap(const void *arg, bool write_only)
{ {
const struct v4l2_cropcap *p = arg; const struct v4l2_cropcap *p = arg;
pr_cont("type=%s, bounds wxh=%dx%d, x,y=%d,%d, defrect wxh=%dx%d, x,y=%d,%d, pixelaspect %d/%d\n", pr_cont("type=%s, bounds (%d,%d)/%ux%u, defrect (%d,%d)/%ux%u, pixelaspect %d/%d\n",
prt_names(p->type, v4l2_type_names), prt_names(p->type, v4l2_type_names),
p->bounds.width, p->bounds.height,
p->bounds.left, p->bounds.top, p->bounds.left, p->bounds.top,
p->defrect.width, p->defrect.height, p->bounds.width, p->bounds.height,
p->defrect.left, p->defrect.top, p->defrect.left, p->defrect.top,
p->defrect.width, p->defrect.height,
p->pixelaspect.numerator, p->pixelaspect.denominator); p->pixelaspect.numerator, p->pixelaspect.denominator);
} }
@ -602,20 +602,20 @@ static void v4l_print_crop(const void *arg, bool write_only)
{ {
const struct v4l2_crop *p = arg; const struct v4l2_crop *p = arg;
pr_cont("type=%s, wxh=%dx%d, x,y=%d,%d\n", pr_cont("type=%s, crop=(%d,%d)/%ux%u\n",
prt_names(p->type, v4l2_type_names), prt_names(p->type, v4l2_type_names),
p->c.width, p->c.height, p->c.left, p->c.top,
p->c.left, p->c.top); p->c.width, p->c.height);
} }
static void v4l_print_selection(const void *arg, bool write_only) static void v4l_print_selection(const void *arg, bool write_only)
{ {
const struct v4l2_selection *p = arg; const struct v4l2_selection *p = arg;
pr_cont("type=%s, target=%d, flags=0x%x, wxh=%dx%d, x,y=%d,%d\n", pr_cont("type=%s, target=%d, flags=0x%x, rect=(%d,%d)/%ux%u\n",
prt_names(p->type, v4l2_type_names), prt_names(p->type, v4l2_type_names),
p->target, p->flags, p->target, p->flags,
p->r.width, p->r.height, p->r.left, p->r.top); p->r.left, p->r.top, p->r.width, p->r.height);
} }
static void v4l_print_jpegcompression(const void *arg, bool write_only) static void v4l_print_jpegcompression(const void *arg, bool write_only)