| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 15 Mar 2019 16:32:21 -0300
From: Helen Koike <helen.koike@...labora.com>
To: André Almeida <andrealmeid@...labora.com>,
linux-media@...r.kernel.org
Cc: mchehab@...nel.org, hverkuil@...all.nl, lucmaga@...il.com,
linux-kernel@...r.kernel.org, kernel@...labora.com
Subject: Re: [PATCH 14/16] media: vimc: sca: Add support for multiplanar
formats
On 3/15/19 1:43 PM, André Almeida wrote:
> Change the scaling functions in order to scale planes. This change makes
> easier to support multiplanar pixel formats.
>
> Signed-off-by: André Almeida <andrealmeid@...labora.com>
> ---
> drivers/media/platform/vimc/vimc-scaler.c | 110 ++++++++++++++--------
> 1 file changed, 69 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/media/platform/vimc/vimc-scaler.c b/drivers/media/platform/vimc/vimc-scaler.c
> index 65519495ecca..15fbb0914056 100644
> --- a/drivers/media/platform/vimc/vimc-scaler.c
> +++ b/drivers/media/platform/vimc/vimc-scaler.c
> @@ -35,10 +35,14 @@ MODULE_PARM_DESC(sca_mult, " the image size multiplier");
> #define IS_SRC(pad) (pad)
> #define MAX_ZOOM 8
>
> +/* TODO: enum only scalable formats */
why is this a TODO? Isn't what it is doing already?
> static const u32 vimc_sca_supported_pixfmt[] = {
> V4L2_PIX_FMT_BGR24,
> V4L2_PIX_FMT_RGB24,
> V4L2_PIX_FMT_ARGB32,
> + V4L2_PIX_FMT_YUV420,
> + V4L2_PIX_FMT_YUV420M,
> + V4L2_PIX_FMT_NV12M,
> };
>
> struct vimc_sca_device {
> @@ -51,8 +55,8 @@ struct vimc_sca_device {
> struct v4l2_mbus_framefmt sink_fmt;
> /* Values calculated when the stream starts */
> struct vimc_frame src_frame;
> - unsigned int src_line_size;
> - unsigned int bpp;
> + unsigned int src_line_size[TPG_MAX_PLANES];
> + unsigned int bpp[TPG_MAX_PLANES];
> };
>
> static const struct v4l2_mbus_framefmt sink_fmt_default = {
> @@ -207,10 +211,10 @@ static const struct v4l2_subdev_pad_ops vimc_sca_pad_ops = {
> static int vimc_sca_s_stream(struct v4l2_subdev *sd, int enable)
> {
> struct vimc_sca_device *vsca = v4l2_get_subdevdata(sd);
> + unsigned int i;
>
> if (enable) {
> u32 pixelformat = vsca->ved.stream->producer_pixfmt;
> - const struct v4l2_format_info *pix_info;
> unsigned int frame_size;
>
> if (!vimc_sca_is_pixfmt_supported(pixelformat)) {
> @@ -219,32 +223,41 @@ static int vimc_sca_s_stream(struct v4l2_subdev *sd, int enable)
> return -EINVAL;
> }
>
> - /* Save the bytes per pixel of the sink */
> - pix_info = v4l2_format_info(pixelformat);
> - vsca->bpp = pix_info->bpp[0];
> -
> - /* Calculate the width in bytes of the src frame */
> - vsca->src_line_size = vsca->sink_fmt.width *
> - sca_mult * vsca->bpp;
> -
> - /* Calculate the frame size of the source pad */
> - frame_size = vsca->src_line_size * vsca->sink_fmt.height *
> - sca_mult;
> -
> - /* Allocate the frame buffer. Use vmalloc to be able to
> - * allocate a large amount of memory
> - */
> - vsca->src_frame.plane_addr[0] = vmalloc(frame_size);
> - vsca->src_frame.sizeimage[0] = frame_size;
> - if (!vsca->src_frame.plane_addr[0])
> - return -ENOMEM;
> + vimc_fill_frame(&vsca->src_frame, pixelformat,
> + vsca->sink_fmt.width, vsca->sink_fmt.height);
> +
> + for (i = 0; i < vsca->src_frame.num_planes; i++) {
> + /* Save the bytes per pixel of the sink */
> + vsca->bpp[i] = vsca->src_frame.bpp[i];
> +
> + /* Calculate the width in bytes of the src frame */
> + vsca->src_line_size[i] =
> + vsca->src_frame.bytesperline[i] * sca_mult;
> +
> + /* Calculate the frame size of the source pad */
> + frame_size = vsca->src_frame.sizeimage[i] *
> + sca_mult * sca_mult;
> +
> + /* Allocate the frame buffer. Use vmalloc to be able to
> + * allocate a large amount of memory
> + */
I know this comment was already like this, but could you please also
correct the style of this comment? It should start with
/*
* Allocate ...
Regards,
Helen
> + vsca->src_frame.plane_addr[i] = vmalloc(frame_size);
> + if (!vsca->src_frame.plane_addr[i]) {
> + for (i -= 1; i >= 0; i--)
> + vfree(vsca->src_frame.plane_addr[i]);
> + return -ENOMEM;
> + }
> + vsca->src_frame.sizeimage[i] = frame_size;
> + }
>
> } else {
> if (!vsca->src_frame.plane_addr[0])
> return 0;
>
> - vfree(vsca->src_frame.plane_addr[0]);
> - vsca->src_frame.plane_addr[0] = NULL;
> + for (i = 0; i < vsca->src_frame.num_planes; i++) {
> + vfree(vsca->src_frame.plane_addr[i]);
> + vsca->src_frame.plane_addr[i] = NULL;
> + }
> }
>
> return 0;
> @@ -270,18 +283,19 @@ static void vimc_sca_fill_pix(u8 *const ptr,
> ptr[i] = pixel[i];
> }
>
> -static void vimc_sca_scale_pix(const struct vimc_sca_device *const vsca,
> +/* TODO: parallelize this function */
> +static void vimc_sca_scale_plane(const struct vimc_sca_device *const vsca,
> const unsigned int lin, const unsigned int col,
> - const u8 *const sink_frame)
> + const struct vimc_frame *sink_frame,
> + u8 num_plane, u32 width)
> +
> {
> unsigned int i, j, index;
> const u8 *pixel;
>
> /* Point to the pixel value in position (lin, col) in the sink frame */
> - index = VIMC_FRAME_INDEX(lin, col,
> - vsca->sink_fmt.width,
> - vsca->bpp);
> - pixel = &sink_frame[index];
> + index = VIMC_FRAME_INDEX(lin, col, width, vsca->bpp[num_plane]);
> + pixel = &sink_frame->plane_addr[num_plane][index];
>
> dev_dbg(vsca->dev,
> "sca: %s: --- scale_pix sink pos %dx%d, index %d ---\n",
> @@ -291,7 +305,7 @@ static void vimc_sca_scale_pix(const struct vimc_sca_device *const vsca,
> * in the scaled src frame
> */
> index = VIMC_FRAME_INDEX(lin * sca_mult, col * sca_mult,
> - vsca->sink_fmt.width * sca_mult, vsca->bpp);
> + width * sca_mult, vsca->bpp[num_plane]);
>
> dev_dbg(vsca->dev, "sca: %s: scale_pix src pos %dx%d, index %d\n",
> vsca->sd.name, lin * sca_mult, col * sca_mult, index);
> @@ -301,32 +315,46 @@ static void vimc_sca_scale_pix(const struct vimc_sca_device *const vsca,
> /* Iterate through each beginning of a
> * pixel repetition in a line
> */
> - for (j = 0; j < sca_mult * vsca->bpp; j += vsca->bpp) {
> + unsigned int bpp = vsca->bpp[num_plane];
> +
> + for (j = 0; j < sca_mult * bpp; j += bpp) {
> dev_dbg(vsca->dev,
> "sca: %s: sca: scale_pix src pos %d\n",
> vsca->sd.name, index + j);
>
> /* copy the pixel to the position index + j */
> vimc_sca_fill_pix(
> - &vsca->src_frame.plane_addr[0][index + j],
> - pixel, vsca->bpp);
> + &vsca->src_frame.plane_addr[num_plane][index + j],
> + pixel, bpp);
> }
>
> /* move the index to the next line */
> - index += vsca->src_line_size;
> + index += vsca->src_line_size[num_plane];
> }
> }
>
> static void vimc_sca_fill_src_frame(const struct vimc_sca_device *const vsca,
> - const u8 *const sink_frame)
> + const struct vimc_frame *sink_frame)
> {
> - unsigned int i, j;
> + u32 i, j, width, height;
> + unsigned int num_plane;
> + const struct v4l2_format_info *info;
> +
> + info = v4l2_format_info(sink_frame->pixelformat);
>
> /* Scale each pixel from the original sink frame */
> /* TODO: implement scale down, only scale up is supported for now */
> - for (i = 0; i < vsca->sink_fmt.height; i++)
> - for (j = 0; j < vsca->sink_fmt.width; j++)
> - vimc_sca_scale_pix(vsca, i, j, sink_frame);
> + for (num_plane = 0; num_plane < info->comp_planes; num_plane++) {
> + width = vsca->sink_fmt.width /
> + ((num_plane == 0) ? 1 : info->vdiv);
> + height = vsca->sink_fmt.height /
> + ((num_plane == 0) ? 1 : info->hdiv);
> +
> + for (i = 0; i < height; i++)
> + for (j = 0; j < width; j++)
> + vimc_sca_scale_plane(vsca, i, j, sink_frame,
> + num_plane, width);
> + }
> }
>
> static struct vimc_frame *vimc_sca_process_frame(struct vimc_ent_device *ved,
> @@ -339,7 +367,7 @@ static struct vimc_frame *vimc_sca_process_frame(struct vimc_ent_device *ved,
> if (!ved->stream)
> return ERR_PTR(-EINVAL);
>
> - vimc_sca_fill_src_frame(vsca, sink_frame->plane_addr[0]);
> + vimc_sca_fill_src_frame(vsca, sink_frame);
>
> return &vsca->src_frame;
> };
>
Powered by blists - more mailing lists