vimc already have a default single planar format.
Add a multiplanar default pixel format to perform those
same actions. Change where the default pixelformat is set to make sure
that the vcap is with the right capabilities.
Signed-off-by: André Almeida <andrealm...@collabora.com>
---
Change in v3:
- Fix typo on commit message
- Add `_sp` to single planar default format
- Modify identation
Change in v2:
- Move here the default format is set to verify if the device have a
multiplanar capability before assign the default format
drivers/media/platform/vimc/vimc-capture.c | 42 ++++++++++++++++------
1 file changed, 32 insertions(+), 10 deletions(-)
diff --git a/drivers/media/platform/vimc/vimc-capture.c
b/drivers/media/platform/vimc/vimc-capture.c
index a23896dad9dd..10c8681de68e 100644
--- a/drivers/media/platform/vimc/vimc-capture.c
+++ b/drivers/media/platform/vimc/vimc-capture.c
@@ -95,7 +95,7 @@ struct vimc_cap_device {
struct vimc_stream stream;
};
-static const struct v4l2_format fmt_default = {
+static const struct v4l2_format fmt_default_sp = {
.type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
.fmt.pix.width = 640,
.fmt.pix.height = 480,
@@ -104,6 +104,15 @@ static const struct v4l2_format fmt_default = {
.fmt.pix.colorspace = V4L2_COLORSPACE_DEFAULT,
};
+static const struct v4l2_format fmt_default_mp = {
+ .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
+ .fmt.pix_mp.width = 640,
+ .fmt.pix_mp.height = 480,
+ .fmt.pix_mp.pixelformat = V4L2_PIX_FMT_YVU420M,
+ .fmt.pix_mp.field = V4L2_FIELD_NONE,
+ .fmt.pix_mp.colorspace = V4L2_COLORSPACE_DEFAULT,
+};
+
struct vimc_cap_buffer {
/*
* struct vb2_v4l2_buffer must be the first element
@@ -149,6 +158,7 @@ static int vimc_cap_try_fmt_vid_cap_mp(struct file *file,
void *priv,
struct v4l2_format *f)
{
struct v4l2_pix_format_mplane *format = &f->fmt.pix_mp;
+ struct vimc_cap_device *vcap = video_drvdata(file);
format->width = clamp_t(u32, format->width, VIMC_FRAME_MIN_WIDTH,
VIMC_FRAME_MAX_WIDTH) & ~1;
@@ -158,13 +168,15 @@ static int vimc_cap_try_fmt_vid_cap_mp(struct file *file,
void *priv,
vimc_colorimetry_clamp(format);
if (format->field == V4L2_FIELD_ANY)
- format->field = fmt_default.fmt.pix.field;
+ format->field = fmt_default_sp.fmt.pix.field;
/* TODO: Add support for custom bytesperline values */
/* Don't accept a pixelformat that is not on the table */
if (!v4l2_format_info(format->pixelformat))
- format->pixelformat = fmt_default.fmt.pix.pixelformat;
+ format->pixelformat = IS_MULTIPLANAR(vcap) ?
+ fmt_default_mp.fmt.pix_mp.pixelformat :
+ fmt_default_sp.fmt.pix.pixelformat;
return v4l2_fill_pixfmt_mp(format, format->pixelformat,
format->width, format->height);
@@ -531,13 +543,6 @@ static int vimc_cap_comp_bind(struct device *comp, struct
device *master,
INIT_LIST_HEAD(&vcap->buf_list);
spin_lock_init(&vcap->qlock);
- /* Set default frame format */
- vcap->format = fmt_default;
- v4l2_fill_pixfmt(&vcap->format.fmt.pix,
- vcap->format.fmt.pix.pixelformat,
- vcap->format.fmt.pix.width,
- vcap->format.fmt.pix.height);
-
/* Fill the vimc_ent_device struct */
vcap->ved.ent = &vcap->vdev.entity;
vcap->ved.process_frame = vimc_cap_process_frame;
@@ -559,6 +564,23 @@ static int vimc_cap_comp_bind(struct device *comp, struct
device *master,
strscpy(vdev->name, pdata->entity_name, sizeof(vdev->name));
video_set_drvdata(vdev, &vcap->ved);
+ dev_dbg(vcap->dev, "vimc-capture is in %s mode",
+ IS_MULTIPLANAR(vcap) ? "multiplanar" : "singleplanar");
+
+ if (IS_MULTIPLANAR(vcap)) {
+ vcap->format = fmt_default_mp;
+ v4l2_fill_pixfmt_mp(&vcap->format.fmt.pix_mp,
+ vcap->format.fmt.pix_mp.pixelformat,
+ vcap->format.fmt.pix_mp.width,
+ vcap->format.fmt.pix_mp.height);
+ } else {
+ vcap->format = fmt_default_sp;
+ v4l2_fill_pixfmt(&vcap->format.fmt.pix,
+ vcap->format.fmt.pix.pixelformat,
+ vcap->format.fmt.pix.width,
+ vcap->format.fmt.pix.height);
+ }
+
/* Register the video_device with the v4l2 and the media framework */
ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
if (ret) {
--
2.21.0
