aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-11-17 07:12:41 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-12-01 12:35:28 -0500
commit736d96b5972a5c5a25afab0c5dd33cb7831a6780 (patch)
treeea01a6ca8469651c5a6cfb7c19f982aeb8558a74
parent11ff030c73655ecd7b153c6bd00d26d27e6cc199 (diff)
[media] v4l2-ioctl.c: log the new ycbcr_enc and quantization fields
Log the new ycbcr_enc and quantization fields. Note that it now also logs the flags field for the multiplanar buffer type. This was forgotten when the flags field was added. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/v4l2-core/v4l2-ioctl.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 1bf84a584242..75658717961f 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -257,7 +257,7 @@ static void v4l_print_format(const void *arg, bool write_only)
257 pr_cont(", width=%u, height=%u, " 257 pr_cont(", width=%u, height=%u, "
258 "pixelformat=%c%c%c%c, field=%s, " 258 "pixelformat=%c%c%c%c, field=%s, "
259 "bytesperline=%u, sizeimage=%u, colorspace=%d, " 259 "bytesperline=%u, sizeimage=%u, colorspace=%d, "
260 "flags %u\n", 260 "flags %x, ycbcr_enc=%u, quantization=%u\n",
261 pix->width, pix->height, 261 pix->width, pix->height,
262 (pix->pixelformat & 0xff), 262 (pix->pixelformat & 0xff),
263 (pix->pixelformat >> 8) & 0xff, 263 (pix->pixelformat >> 8) & 0xff,
@@ -265,21 +265,24 @@ static void v4l_print_format(const void *arg, bool write_only)
265 (pix->pixelformat >> 24) & 0xff, 265 (pix->pixelformat >> 24) & 0xff,
266 prt_names(pix->field, v4l2_field_names), 266 prt_names(pix->field, v4l2_field_names),
267 pix->bytesperline, pix->sizeimage, 267 pix->bytesperline, pix->sizeimage,
268 pix->colorspace, pix->flags); 268 pix->colorspace, pix->flags, pix->ycbcr_enc,
269 pix->quantization);
269 break; 270 break;
270 case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: 271 case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
271 case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: 272 case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
272 mp = &p->fmt.pix_mp; 273 mp = &p->fmt.pix_mp;
273 pr_cont(", width=%u, height=%u, " 274 pr_cont(", width=%u, height=%u, "
274 "format=%c%c%c%c, field=%s, " 275 "format=%c%c%c%c, field=%s, "
275 "colorspace=%d, num_planes=%u\n", 276 "colorspace=%d, num_planes=%u, flags=%x, "
277 "ycbcr_enc=%u, quantization=%u\n",
276 mp->width, mp->height, 278 mp->width, mp->height,
277 (mp->pixelformat & 0xff), 279 (mp->pixelformat & 0xff),
278 (mp->pixelformat >> 8) & 0xff, 280 (mp->pixelformat >> 8) & 0xff,
279 (mp->pixelformat >> 16) & 0xff, 281 (mp->pixelformat >> 16) & 0xff,
280 (mp->pixelformat >> 24) & 0xff, 282 (mp->pixelformat >> 24) & 0xff,
281 prt_names(mp->field, v4l2_field_names), 283 prt_names(mp->field, v4l2_field_names),
282 mp->colorspace, mp->num_planes); 284 mp->colorspace, mp->num_planes, mp->flags,
285 mp->ycbcr_enc, mp->quantization);
283 for (i = 0; i < mp->num_planes; i++) 286 for (i = 0; i < mp->num_planes; i++)
284 printk(KERN_DEBUG "plane %u: bytesperline=%u sizeimage=%u\n", i, 287 printk(KERN_DEBUG "plane %u: bytesperline=%u sizeimage=%u\n", i,
285 mp->plane_fmt[i].bytesperline, 288 mp->plane_fmt[i].bytesperline,