| 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, 26 Jun 2020 08:55:36 -0300
From: Helen Koike <helen.koike@...labora.com>
To: Kaaira Gupta <kgupta@...iitr.ac.in>,
Shuah Khan <skhan@...uxfoundation.org>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
Kieran Bingham <kieran.bingham@...asonboard.com>,
hverkuil@...all.nl
Subject: Re: [PATCH v6 3/3] media: vimc: Add a control to display info on test
image
Hi Kaaira,
Thanks for the patch,
On 6/26/20 8:36 AM, Kaaira Gupta wrote:
> Add a control in VIMC to display information such as the correct order of
> colors for a given test pattern, brightness, hue, saturation, contrast,
> width and height at sensor, and time since streaming started over test image.
>
> Signed-off-by: Kaaira Gupta <kgupta@...iitr.ac.in>
> ---
> drivers/media/test-drivers/vimc/Kconfig | 2 +
> drivers/media/test-drivers/vimc/vimc-common.h | 1 +
> drivers/media/test-drivers/vimc/vimc-core.c | 10 ++++
> drivers/media/test-drivers/vimc/vimc-sensor.c | 60 +++++++++++++++++++
> 4 files changed, 73 insertions(+)
>
> diff --git a/drivers/media/test-drivers/vimc/Kconfig b/drivers/media/test-drivers/vimc/Kconfig
> index 4068a67585f9..da4b2ad6e40c 100644
> --- a/drivers/media/test-drivers/vimc/Kconfig
> +++ b/drivers/media/test-drivers/vimc/Kconfig
> @@ -2,6 +2,8 @@
> config VIDEO_VIMC
> tristate "Virtual Media Controller Driver (VIMC)"
> depends on VIDEO_DEV && VIDEO_V4L2
> + select FONT_SUPPORT
> + select FONT_8x16
> select MEDIA_CONTROLLER
> select VIDEO_V4L2_SUBDEV_API
> select VIDEOBUF2_VMALLOC
> diff --git a/drivers/media/test-drivers/vimc/vimc-common.h b/drivers/media/test-drivers/vimc/vimc-common.h
> index ae163dec2459..a289434e75ba 100644
> --- a/drivers/media/test-drivers/vimc/vimc-common.h
> +++ b/drivers/media/test-drivers/vimc/vimc-common.h
> @@ -20,6 +20,7 @@
> #define VIMC_CID_VIMC_CLASS (0x00f00000 | 1)
> #define VIMC_CID_TEST_PATTERN (VIMC_CID_VIMC_BASE + 0)
> #define VIMC_CID_MEAN_WIN_SIZE (VIMC_CID_VIMC_BASE + 1)
> +#define VIMC_CID_OSD_TEXT_MODE (VIMC_CID_VIMC_BASE + 2)
>
> #define VIMC_FRAME_MAX_WIDTH 4096
> #define VIMC_FRAME_MAX_HEIGHT 2160
> diff --git a/drivers/media/test-drivers/vimc/vimc-core.c b/drivers/media/test-drivers/vimc/vimc-core.c
> index 11210aaa2551..8337e1276bba 100644
> --- a/drivers/media/test-drivers/vimc/vimc-core.c
> +++ b/drivers/media/test-drivers/vimc/vimc-core.c
> @@ -5,10 +5,12 @@
> * Copyright (C) 2015-2017 Helen Koike <helen.fornazier@...il.com>
> */
>
> +#include <linux/font.h>
> #include <linux/init.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <media/media-device.h>
> +#include <media/tpg/v4l2-tpg.h>
> #include <media/v4l2-device.h>
>
> #include "vimc-common.h"
> @@ -263,11 +265,19 @@ static int vimc_register_devices(struct vimc_device *vimc)
>
> static int vimc_probe(struct platform_device *pdev)
> {
> + const struct font_desc *font = find_font("VGA8x16");
> struct vimc_device *vimc;
> int ret;
>
> dev_dbg(&pdev->dev, "probe");
>
> + if (!font) {
> + dev_err(&pdev->dev, "vimc: could not find font\n");
You don't need the "vimc: " prefix if you are using dev_err(), it already gets the name from pdev->dev
> + return -ENODEV;
> + }
> +
> + tpg_set_font(font->data);
> +
> vimc = kzalloc(sizeof(*vimc), GFP_KERNEL);
> if (!vimc)
> return -ENOMEM;
> diff --git a/drivers/media/test-drivers/vimc/vimc-sensor.c b/drivers/media/test-drivers/vimc/vimc-sensor.c
> index a2f09ac9a360..ce438cdabb73 100644
> --- a/drivers/media/test-drivers/vimc/vimc-sensor.c
> +++ b/drivers/media/test-drivers/vimc/vimc-sensor.c
> @@ -19,6 +19,8 @@ struct vimc_sen_device {
> struct v4l2_subdev sd;
> struct tpg_data tpg;
> u8 *frame;
> + unsigned int osd_mode;
> + u64 start_stream_ts;
> /* The active format */
> struct v4l2_mbus_framefmt mbus_format;
> struct v4l2_ctrl_handler hdl;
> @@ -185,10 +187,46 @@ static const struct v4l2_subdev_pad_ops vimc_sen_pad_ops = {
> static void *vimc_sen_process_frame(struct vimc_ent_device *ved,
> const void *sink_frame)
> {
> + enum osd_mode {OSD_SHOW_ALL = 0, OSD_SHOW_COUNTERS = 1};
> + u8 *basep[TPG_MAX_PLANES][2];
> + char str[100];
> + int line = 1;
unsigned int
> + const unsigned int line_height = 16;
> struct vimc_sen_device *vsen = container_of(ved, struct vimc_sen_device,
> ved);
I would just re-order the declaration vars to have the longest lines first.
>
> tpg_fill_plane_buffer(&vsen->tpg, 0, 0, vsen->frame);
> + tpg_calc_text_basep(&vsen->tpg, basep, 0, vsen->frame);
> +
> + if (vsen->osd_mode <= OSD_SHOW_COUNTERS) {
> + unsigned int ms;
> +
> + ms = (ktime_get_ns() - vsen->start_stream_ts) / 1000000;
> + snprintf(str, sizeof(str), "%02d:%02d:%02d:%03d",
> + (ms / (60 * 60 * 1000)) % 24,
> + (ms / (60 * 1000)) % 60,
> + (ms / 1000) % 60,
> + ms % 1000);
> + tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
> + }
> +
> + if (vsen->osd_mode == OSD_SHOW_ALL) {
> + const char *order = tpg_g_color_order(&vsen->tpg);
> +
> + tpg_gen_text(&vsen->tpg, basep,
> + line++ * line_height, 16, order);
> + snprintf(str, sizeof(str),
> + "brightness %3d, contrast %3d, saturation %3d, hue %d ",
> + vsen->tpg.brightness,
> + vsen->tpg.contrast,
> + vsen->tpg.saturation,
> + vsen->tpg.hue);
> + tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
> + snprintf(str, sizeof(str), "sensor size: %dx%d",
> + vsen->mbus_format.width, vsen->mbus_format.height);
> + tpg_gen_text(&vsen->tpg, basep, line++ * line_height, 16, str);
> + }
How about the nice case-switch statement proposed by Kieram in the last version?
Thanks,
Helen
> +
> return vsen->frame;
> }
>
> @@ -201,6 +239,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)
> const struct vimc_pix_map *vpix;
> unsigned int frame_size;
>
> + vsen->start_stream_ts = ktime_get_ns();
> +
> /* Calculate the frame size */
> vpix = vimc_pix_map_by_code(vsen->mbus_format.code);
> frame_size = vsen->mbus_format.width * vpix->bpp *
> @@ -269,6 +309,9 @@ static int vimc_sen_s_ctrl(struct v4l2_ctrl *ctrl)
> case V4L2_CID_SATURATION:
> tpg_s_saturation(&vsen->tpg, ctrl->val);
> break;
> + case VIMC_CID_OSD_TEXT_MODE:
> + vsen->osd_mode = ctrl->val;
> + break;
> default:
> return -EINVAL;
> }
> @@ -307,6 +350,22 @@ static const struct v4l2_ctrl_config vimc_sen_ctrl_test_pattern = {
> .qmenu = tpg_pattern_strings,
> };
>
> +static const char * const vimc_ctrl_osd_mode_strings[] = {
> + "All",
> + "Counters Only",
> + "None",
> + NULL,
> +};
> +
> +static const struct v4l2_ctrl_config vimc_sen_ctrl_osd_mode = {
> + .ops = &vimc_sen_ctrl_ops,
> + .id = VIMC_CID_OSD_TEXT_MODE,
> + .name = "Show Information",
> + .type = V4L2_CTRL_TYPE_MENU,
> + .max = ARRAY_SIZE(vimc_ctrl_osd_mode_strings) - 2,
> + .qmenu = vimc_ctrl_osd_mode_strings,
> +};
> +
> static struct vimc_ent_device *vimc_sen_add(struct vimc_device *vimc,
> const char *vcfg_name)
> {
> @@ -323,6 +382,7 @@ static struct vimc_ent_device *vimc_sen_add(struct vimc_device *vimc,
>
> v4l2_ctrl_new_custom(&vsen->hdl, &vimc_sen_ctrl_class, NULL);
> v4l2_ctrl_new_custom(&vsen->hdl, &vimc_sen_ctrl_test_pattern, NULL);
> + v4l2_ctrl_new_custom(&vsen->hdl, &vimc_sen_ctrl_osd_mode, NULL);
> v4l2_ctrl_new_std(&vsen->hdl, &vimc_sen_ctrl_ops,
> V4L2_CID_VFLIP, 0, 1, 1, 0);
> v4l2_ctrl_new_std(&vsen->hdl, &vimc_sen_ctrl_ops,
>
Powered by blists - more mailing lists