lkml.org 
[lkml]   [2019]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 10/16] media: vimc: cap: Add multiplanar default format
Date
vimc already have a default single planar default format.
Add a multiplanar default pixel format to perfom those
same actions.

Signed-off-by: André Almeida <andrealmeid@collabora.com>
---
drivers/media/platform/vimc/vimc-capture.c | 31 +++++++++++++++++-----
1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c
index 2d668012e9e9..24052f15c4cf 100644
--- a/drivers/media/platform/vimc/vimc-capture.c
+++ b/drivers/media/platform/vimc/vimc-capture.c
@@ -96,6 +96,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
@@ -160,7 +169,9 @@ static int vimc_cap_try_fmt_vid_cap(struct file *file, void *priv,

/* 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 = multiplanar ?
+ fmt_default_mp.fmt.pix_mp.pixelformat :
+ fmt_default.fmt.pix.pixelformat;

return v4l2_fill_pixfmt_mp(format, format->pixelformat,
format->width, format->height);
@@ -627,11 +638,19 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master,
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);
+ if (multiplanar) {
+ 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;
+ 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;
--
2.21.0
\
 
 \ /
  Last update: 2019-03-15 17:46    [W:0.078 / U:1.056 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site