From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7840EC10F0E for ; Fri, 12 Apr 2019 22:48:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4460D20818 for ; Fri, 12 Apr 2019 22:48:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727197AbfDLWsg (ORCPT ); Fri, 12 Apr 2019 18:48:36 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:36520 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726953AbfDLWsf (ORCPT ); Fri, 12 Apr 2019 18:48:35 -0400 Received: from [IPv6:2804:431:9718:a5e8:c168:522a:50d5:d06d] (unknown [IPv6:2804:431:9718:a5e8:c168:522a:50d5:d06d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: koike) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 77E09281631; Fri, 12 Apr 2019 23:48:29 +0100 (BST) Subject: Re: [PATCH v2 03/15] media: vimc: cap: Change vimc_cap_device.format type To: =?UTF-8?Q?Andr=c3=a9_Almeida?= , linux-media@vger.kernel.org Cc: mchehab@kernel.org, hverkuil@xs4all.nl, lucmaga@gmail.com, linux-kernel@vger.kernel.org, kernel@collabora.com, lkcamp@lists.libreplanetbr.org References: <20190327151743.18528-1-andrealmeid@collabora.com> <20190327151743.18528-4-andrealmeid@collabora.com> From: Helen Koike Openpgp: preference=signencrypt Autocrypt: addr=helen.koike@collabora.com; keydata= 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 Message-ID: <6d60eda0-a5dd-47a8-6aca-c6f8d6f12e10@collabora.com> Date: Fri, 12 Apr 2019 19:48:22 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <20190327151743.18528-4-andrealmeid@collabora.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/27/19 12:17 PM, André Almeida wrote: > vimc_cap_device.format field was defined as v4l2_pix_format, > a struct to handle single planar pixel formats. It turns out that > if v4l2_format is used, we can reuse functions for both > v4l2_pix_format and v4l2_pix_format_mplane. This change will > help at future commits implementing multiplanar pixel > format support. > > Signed-off-by: André Almeida Acked-by: Helen Koike > --- > Change in v2: none > > drivers/media/platform/vimc/vimc-capture.c | 56 ++++++++++++---------- > 1 file changed, 31 insertions(+), 25 deletions(-) > > diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c > index e7d0fc2228a6..de52f20b5c85 100644 > --- a/drivers/media/platform/vimc/vimc-capture.c > +++ b/drivers/media/platform/vimc/vimc-capture.c > @@ -58,7 +58,7 @@ struct vimc_cap_device { > struct vimc_ent_device ved; > struct video_device vdev; > struct device *dev; > - struct v4l2_pix_format format; > + struct v4l2_format format; > struct vb2_queue queue; > struct list_head buf_list; > /* > @@ -74,12 +74,13 @@ struct vimc_cap_device { > struct vimc_stream stream; > }; > > -static const struct v4l2_pix_format fmt_default = { > - .width = 640, > - .height = 480, > - .pixelformat = V4L2_PIX_FMT_RGB24, > - .field = V4L2_FIELD_NONE, > - .colorspace = V4L2_COLORSPACE_DEFAULT, > +static const struct v4l2_format fmt_default = { > + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, > + .fmt.pix.width = 640, > + .fmt.pix.height = 480, > + .fmt.pix.pixelformat = V4L2_PIX_FMT_RGB24, > + .fmt.pix.field = V4L2_FIELD_NONE, > + .fmt.pix.colorspace = V4L2_COLORSPACE_DEFAULT, > }; > > struct vimc_cap_buffer { > @@ -110,7 +111,7 @@ static void vimc_cap_get_format(struct vimc_ent_device *ved, > struct vimc_cap_device *vcap = container_of(ved, struct vimc_cap_device, > ved); > > - *fmt = vcap->format; > + *fmt = vcap->format.fmt.pix; > } > > static int vimc_cap_g_fmt_vid_cap(struct file *file, void *priv, > @@ -118,7 +119,7 @@ static int vimc_cap_g_fmt_vid_cap(struct file *file, void *priv, > { > struct vimc_cap_device *vcap = video_drvdata(file); > > - f->fmt.pix = vcap->format; > + *f = vcap->format; > > return 0; > } > @@ -136,13 +137,13 @@ static int vimc_cap_try_fmt_vid_cap(struct file *file, void *priv, > vimc_colorimetry_clamp(format); > > if (format->field == V4L2_FIELD_ANY) > - format->field = fmt_default.field; > + format->field = fmt_default.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.pixelformat; > + format->pixelformat = fmt_default.fmt.pix.pixelformat; > > return v4l2_fill_pixfmt(format, format->pixelformat, > format->width, format->height); > @@ -163,17 +164,19 @@ static int vimc_cap_s_fmt_vid_cap(struct file *file, void *priv, > "old:%dx%d (0x%x, %d, %d, %d, %d) " > "new:%dx%d (0x%x, %d, %d, %d, %d)\n", vcap->vdev.name, > /* old */ > - vcap->format.width, vcap->format.height, > - vcap->format.pixelformat, vcap->format.colorspace, > - vcap->format.quantization, vcap->format.xfer_func, > - vcap->format.ycbcr_enc, > + vcap->format.fmt.pix.width, vcap->format.fmt.pix.height, > + vcap->format.fmt.pix.pixelformat, > + vcap->format.fmt.pix.colorspace, > + vcap->format.fmt.pix.quantization, > + vcap->format.fmt.pix.xfer_func, > + vcap->format.fmt.pix.ycbcr_enc, > /* new */ > f->fmt.pix.width, f->fmt.pix.height, > f->fmt.pix.pixelformat, f->fmt.pix.colorspace, > f->fmt.pix.quantization, f->fmt.pix.xfer_func, > f->fmt.pix.ycbcr_enc); > > - vcap->format = f->fmt.pix; > + vcap->format = *f; > > return 0; > } > @@ -279,7 +282,8 @@ static int vimc_cap_start_streaming(struct vb2_queue *vq, unsigned int count) > return ret; > } > > - vcap->stream.producer_pixfmt = vcap->format.pixelformat; > + vcap->stream.producer_pixfmt = vcap->format.fmt.pix.pixelformat; > + > ret = vimc_streamer_s_stream(&vcap->stream, &vcap->ved, 1); > if (ret) { > media_pipeline_stop(entity); > @@ -326,10 +330,10 @@ static int vimc_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, > struct vimc_cap_device *vcap = vb2_get_drv_priv(vq); > > if (*nplanes) > - return sizes[0] < vcap->format.sizeimage ? -EINVAL : 0; > + return sizes[0] < vcap->format.fmt.pix.sizeimage ? -EINVAL : 0; > /* We don't support multiplanes for now */ > *nplanes = 1; > - sizes[0] = vcap->format.sizeimage; > + sizes[0] = vcap->format.fmt.pix.sizeimage; > > return 0; > } > @@ -337,7 +341,7 @@ static int vimc_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, > static int vimc_cap_buffer_prepare(struct vb2_buffer *vb) > { > struct vimc_cap_device *vcap = vb2_get_drv_priv(vb->vb2_queue); > - unsigned long size = vcap->format.sizeimage; > + unsigned long size = vcap->format.fmt.pix.sizeimage; > > if (vb2_plane_size(vb, 0) < size) { > dev_err(vcap->dev, "%s: buffer too small (%lu < %lu)\n", > @@ -412,15 +416,15 @@ static void *vimc_cap_process_frame(struct vimc_ent_device *ved, > /* Fill the buffer */ > vimc_buf->vb2.vb2_buf.timestamp = ktime_get_ns(); > vimc_buf->vb2.sequence = vcap->sequence++; > - vimc_buf->vb2.field = vcap->format.field; > + vimc_buf->vb2.field = vcap->format.fmt.pix.field; > > vbuf = vb2_plane_vaddr(&vimc_buf->vb2.vb2_buf, 0); > > - memcpy(vbuf, frame, vcap->format.sizeimage); > + memcpy(vbuf, frame, vcap->format.fmt.pix.sizeimage); > > /* Set it as ready */ > vb2_set_plane_payload(&vimc_buf->vb2.vb2_buf, 0, > - vcap->format.sizeimage); > + vcap->format.fmt.pix.sizeimage); > vb2_buffer_done(&vimc_buf->vb2.vb2_buf, VB2_BUF_STATE_DONE); > return NULL; > } > @@ -484,8 +488,10 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, > > /* Set default frame format */ > vcap->format = fmt_default; > - v4l2_fill_pixfmt(&vcap->format, vcap->format.pixelformat, > - vcap->format.width, vcap->format.height); > + 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; >