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=-8.5 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 D0FD7C433E1 for ; Fri, 26 Jun 2020 12:46:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A289207E8 for ; Fri, 26 Jun 2020 12:46:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=es-iitr-ac-in.20150623.gappssmtp.com header.i=@es-iitr-ac-in.20150623.gappssmtp.com header.b="gfI90Mmb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726875AbgFZMqh (ORCPT ); Fri, 26 Jun 2020 08:46:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725283AbgFZMqg (ORCPT ); Fri, 26 Jun 2020 08:46:36 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2184CC08C5DB for ; Fri, 26 Jun 2020 05:46:35 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id u8so4667076pje.4 for ; Fri, 26 Jun 2020 05:46:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=qp7cxXNnoQLpTzXpdFOv4m150rdWcZ4/YgkjWFZjCkI=; b=gfI90MmbelR+XJ0JnMP7klGkKtzrZvQGQ4Er89vl85IAH0afuMNDjCRDRjKPmm4WCj ly9jFt43ZDfiHmVXOkioLYauy45iF12mMVna+ZPLaslNF+NLoKTUAHDWIZFQPPKcJzfx X0QsJrK3i194+u7f8jXF+GFzjLY0MyGonNglsvS7ivnCKzlIkqtCuWI/wDroOMrV3kwv z+xAOdHJLb8DIUYutd8V4aMFZpMZlBCZiIy/heZ6dkyQKuCRZFVHHOnBi6ZTBcFwq84H 1aCchSxt3QUY5ddYNyJEhXprR6iv/3PB4kYOotsM1ks4Q9Q6D5CXmi0rgfVX7UiSNbTN 1C6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=qp7cxXNnoQLpTzXpdFOv4m150rdWcZ4/YgkjWFZjCkI=; b=W5/nbpcIMAmgmrtJinAuixTxCKTD4GylUxKhCgbohcfosXvtvBn4Ox/Qr15vjYTDJX dLKYaYubQdId0NheZBFfNinQ7mieUgeiR7sV/R7gEALho88Ge6fRxbyxWEKuo+jZ3ZzJ X/dlH7Dlx+iANoqR6X0MZKpCZlOhNG/BC1zeao863pBq5VqSw3U8T2bx/qJRd57666Eg 1ojKb97FjOS0DpxpCOMhOc+dZV0SRmEBt8a/Ef00FmwQriaZbyIchsb7XPLRFBcWs2Vh uA+hA6uWp//rkIgZC9H4GlFFjSjCshCFowOMNgp4brGdotORj6toTq6sNWX8XT8nOv7l qQqA== X-Gm-Message-State: AOAM5324kChySyw2vXx84IAtt2rUYWYlbdjOaEfM4Ji8rEs9wa3vdKRr Kx5IHZjwgQ563EBQRatC6C93v+HXqkfv9A== X-Google-Smtp-Source: ABdhPJzIbRLlpBSqRNqrORwPDB30Vu3JF61XDQZkQ2dT81CeMikzWmSvZlOLXvC5d8gJh3jzGLE5yA== X-Received: by 2002:a17:90b:3d7:: with SMTP id go23mr3310630pjb.157.1593175594561; Fri, 26 Jun 2020 05:46:34 -0700 (PDT) Received: from kaaira-HP-Pavilion-Notebook ([103.113.213.178]) by smtp.gmail.com with ESMTPSA id w24sm25684475pfn.11.2020.06.26.05.46.30 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 05:46:33 -0700 (PDT) From: Kaaira Gupta X-Google-Original-From: Kaaira Gupta Date: Fri, 26 Jun 2020 18:16:26 +0530 To: Helen Koike Cc: Kaaira Gupta , Shuah Khan , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Kieran Bingham , hverkuil@xs4all.nl Subject: Re: [PATCH v6 3/3] media: vimc: Add a control to display info on test image Message-ID: <20200626124626.GA13722@kaaira-HP-Pavilion-Notebook> References: <20200626113618.15280-1-kgupta@es.iitr.ac.in> <20200626113618.15280-4-kgupta@es.iitr.ac.in> <694350b5-cd61-1e9d-36ee-6028b59a53a6@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <694350b5-cd61-1e9d-36ee-6028b59a53a6@collabora.com> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 26, 2020 at 08:59:19AM -0300, Helen Koike wrote: > 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 > > --- > > 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 > > */ > > > > +#include > > #include > > #include > > #include > > #include > > +#include > > #include > > > > #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 Kieran in the last version? If I use switch-case, I can then not declare const char * order, which gives order of colors, /inside/ the case when it needs to be printed. I can declare it outside, with all other initialisations if that is fine but that would mean calling the function unnecessarily if its not to be printed..which case should I go with? > > 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, > >