From: Thibault Saunier <thibault.saunier@osg.samsung.com> To: linux-kernel@vger.kernel.org Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>, Andi Shyti <andi.shyti@samsung.com>, Shuah Khan <shuahkh@osg.samsung.com>, Inki Dae <inki.dae@samsung.com>, Nicolas Dufresne <nicolas.dufresne@collabora.com>, Javier Martinez Canillas <javier@osg.samsung.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Marek Szyprowski <m.szyprowski@samsung.com>, Kukjin Kim <kgene@kernel.org>, linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki <s.nawrocki@samsung.com>, linux-media@vger.kernel.org, Krzysztof Kozlowski <krzk@kernel.org>, linux-arm-kernel@lists.infradead.org, Ulf Hansson <ulf.hansson@linaro.org>, Thibault Saunier <thibault.saunier@osg.samsung.com> Subject: [PATCH v2 4/4] [media] s5p-mfc: Always check and set 'v4l2_pix_format:field' field Date: Thu, 9 Feb 2017 17:04:20 -0300 [thread overview] Message-ID: <20170209200420.3046-5-thibault.saunier@osg.samsung.com> (raw) In-Reply-To: <20170209200420.3046-1-thibault.saunier@osg.samsung.com> It is required by the standard that the field order is set by the driver. Signed-off-by: Thibault Saunier <thibault.saunier@osg.samsung.com> --- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index 960d6c7052bd..309b0a1bbca5 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -345,7 +345,6 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) rectangle. */ pix_mp->width = ctx->buf_width; pix_mp->height = ctx->buf_height; - pix_mp->field = V4L2_FIELD_NONE; pix_mp->num_planes = 2; /* Set pixelformat to the format in which MFC outputs the decoded frame */ @@ -369,7 +368,6 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) so width and height have no meaning */ pix_mp->width = 0; pix_mp->height = 0; - pix_mp->field = V4L2_FIELD_NONE; pix_mp->plane_fmt[0].bytesperline = ctx->dec_src_buf_size; pix_mp->plane_fmt[0].sizeimage = ctx->dec_src_buf_size; pix_mp->pixelformat = ctx->src_fmt->fourcc; @@ -379,6 +377,14 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) mfc_debug(2, "%s-- with error\n", __func__); return -EINVAL; } + + if (pix_mp->field == V4L2_FIELD_ANY) { + pix_mp->field = V4L2_FIELD_NONE; + } else if (pix_mp->field != V4L2_FIELD_NONE) { + mfc_err("Not supported field order(%d)\n", pix_mp->field); + return -EINVAL; + } + mfc_debug_leave(); return 0; } @@ -389,6 +395,19 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) struct s5p_mfc_dev *dev = video_drvdata(file); struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; struct s5p_mfc_fmt *fmt; + enum v4l2_field field; + + field = f->fmt.pix.field; + if (field == V4L2_FIELD_ANY) { + field = V4L2_FIELD_NONE; + } else if (V4L2_FIELD_NONE != field) { + mfc_debug(2, "Not supported field order(%d)\n", pix_mp->field); + return -EINVAL; + } + + /* V4L2 specification suggests the driver corrects the format struct + * if any of the dimensions is unsupported */ + f->fmt.pix.field = field; mfc_debug(2, "Type is %d\n", f->type); if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { -- 2.11.1
WARNING: multiple messages have this Message-ID (diff)
From: thibault.saunier@osg.samsung.com (Thibault Saunier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 4/4] [media] s5p-mfc: Always check and set 'v4l2_pix_format:field' field Date: Thu, 9 Feb 2017 17:04:20 -0300 [thread overview] Message-ID: <20170209200420.3046-5-thibault.saunier@osg.samsung.com> (raw) In-Reply-To: <20170209200420.3046-1-thibault.saunier@osg.samsung.com> It is required by the standard that the field order is set by the driver. Signed-off-by: Thibault Saunier <thibault.saunier@osg.samsung.com> --- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index 960d6c7052bd..309b0a1bbca5 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -345,7 +345,6 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) rectangle. */ pix_mp->width = ctx->buf_width; pix_mp->height = ctx->buf_height; - pix_mp->field = V4L2_FIELD_NONE; pix_mp->num_planes = 2; /* Set pixelformat to the format in which MFC outputs the decoded frame */ @@ -369,7 +368,6 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) so width and height have no meaning */ pix_mp->width = 0; pix_mp->height = 0; - pix_mp->field = V4L2_FIELD_NONE; pix_mp->plane_fmt[0].bytesperline = ctx->dec_src_buf_size; pix_mp->plane_fmt[0].sizeimage = ctx->dec_src_buf_size; pix_mp->pixelformat = ctx->src_fmt->fourcc; @@ -379,6 +377,14 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) mfc_debug(2, "%s-- with error\n", __func__); return -EINVAL; } + + if (pix_mp->field == V4L2_FIELD_ANY) { + pix_mp->field = V4L2_FIELD_NONE; + } else if (pix_mp->field != V4L2_FIELD_NONE) { + mfc_err("Not supported field order(%d)\n", pix_mp->field); + return -EINVAL; + } + mfc_debug_leave(); return 0; } @@ -389,6 +395,19 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) struct s5p_mfc_dev *dev = video_drvdata(file); struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; struct s5p_mfc_fmt *fmt; + enum v4l2_field field; + + field = f->fmt.pix.field; + if (field == V4L2_FIELD_ANY) { + field = V4L2_FIELD_NONE; + } else if (V4L2_FIELD_NONE != field) { + mfc_debug(2, "Not supported field order(%d)\n", pix_mp->field); + return -EINVAL; + } + + /* V4L2 specification suggests the driver corrects the format struct + * if any of the dimensions is unsupported */ + f->fmt.pix.field = field; mfc_debug(2, "Type is %d\n", f->type); if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { -- 2.11.1
next prev parent reply other threads:[~2017-02-09 20:05 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-09 20:04 [PATCH v2 0/4] [media] Fixes for colorspace logic in exynos-gsc and s5p-mfc drivers Thibault Saunier 2017-02-09 20:04 ` Thibault Saunier 2017-02-09 20:04 ` Thibault Saunier 2017-02-09 20:04 ` [PATCH v2 1/4] [media] exynos-gsc: Use 576p instead 720p as a threshold for colorspaces Thibault Saunier 2017-02-09 20:04 ` Thibault Saunier 2017-02-10 6:58 ` Andrzej Hajda 2017-02-10 6:58 ` Andrzej Hajda 2017-02-10 19:38 ` Russell King - ARM Linux 2017-02-10 19:38 ` Russell King - ARM Linux 2017-02-13 8:47 ` Hans Verkuil 2017-02-13 8:47 ` Hans Verkuil 2017-02-09 20:04 ` [PATCH v2 2/4] [media] exynos-gsc: Respect userspace colorspace setting Thibault Saunier 2017-02-09 20:04 ` Thibault Saunier 2017-02-10 7:01 ` Andrzej Hajda 2017-02-10 7:01 ` Andrzej Hajda 2017-02-09 20:04 ` [PATCH v2 3/4] [media] s5p-mfc: Set colorspace in VIDIO_{G,TRY}_FMT Thibault Saunier 2017-02-09 20:04 ` Thibault Saunier 2017-02-10 7:03 ` Andrzej Hajda 2017-02-10 7:03 ` [PATCH v2 3/4] [media] s5p-mfc: Set colorspace in VIDIO_{G, TRY}_FMT Andrzej Hajda 2017-02-09 20:04 ` Thibault Saunier [this message] 2017-02-09 20:04 ` [PATCH v2 4/4] [media] s5p-mfc: Always check and set 'v4l2_pix_format:field' field Thibault Saunier 2017-02-10 7:08 ` Andrzej Hajda 2017-02-10 7:08 ` Andrzej Hajda 2017-02-10 7:08 ` Andrzej Hajda
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170209200420.3046-5-thibault.saunier@osg.samsung.com \ --to=thibault.saunier@osg.samsung.com \ --cc=andi.shyti@samsung.com \ --cc=inki.dae@samsung.com \ --cc=javier@osg.samsung.com \ --cc=kgene@kernel.org \ --cc=krzk@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=mchehab@kernel.org \ --cc=mchehab@s-opensource.com \ --cc=nicolas.dufresne@collabora.com \ --cc=s.nawrocki@samsung.com \ --cc=shuahkh@osg.samsung.com \ --cc=ulf.hansson@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.