Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp554780ybt; Fri, 26 Jun 2020 06:09:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1QHGeDSLBGFh4xck3YJ2pXoreMl3qoKHbEIcwn5g4oOGzmKcxslIyrrm9ERzEq7AfhvJ1 X-Received: by 2002:a17:906:c44c:: with SMTP id ck12mr2551872ejb.145.1593176942368; Fri, 26 Jun 2020 06:09:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593176942; cv=none; d=google.com; s=arc-20160816; b=Xh5Xsn5ie1HSejZXATWc4Tr70YDWe0F2/JPTPPp04gIbDBeZiEWfymQJcTlTfa6t2a LyGw+BpCuuhslsOSHgbzGeI1TMDGY1l/uJoEDXyuk7MbbGR/Ww5Mth6jOUq40uy0xDx9 0G8THK4ofg0daXKyqLwVNxUfao2tOZaF9U1hOBdF6vCXdmwr7CxQmhY5Ffs4CktiP+dS borNbLB2o+8drghSA05stYf5D9P1WsAc32PZjLQxEc0Ldd4idR5ZwUZEHArLLAL3ZD5M FDIHPkzqpP9cTE+sQaXTor/H2QCOdAClRtCTBN1CQZUXPnhgf9wmwCgK7vpQImQBafmo Pqjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=NRJmV6QfNACg/W2qGdUyNfNSRYBISUhip+jiANXSZ2U=; b=GZUpnYPSzrhS/jx0g/zDwALtfnbLYKd0+pyWEy/grEQbHb8WJEsrT6ckycSbIBQmFL ljdUVl0S6fPGNAo/6id3lN3d+Rkh+jR+ZslOr1lXTJ03SJ0fAgmaIDQTOQ+2JEIT075+ b4onmjW497NsG5VU4Oh9m9AMVGTVcdOW4lidLzD572R1LLw+jZ4R6LsIYgdgOKQgFWw7 Mo1lI+RWY3MkIsSfc/ndBky9BS1hzDGCETs7e2VUQGg0I/67lI21KgPuApacXYFzW6vs CT9fVK061Dl7fn0aUq3Jmrs0Q/vcTnnSemRDUbPtkeW4bLlr/hdX/TuIM3WSogzvFZnD rBOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@es-iitr-ac-in.20150623.gappssmtp.com header.s=20150623 header.b=C9HB4SED; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=iitr.ac.in Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p3si16355651edr.104.2020.06.26.06.08.38; Fri, 26 Jun 2020 06:09:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@es-iitr-ac-in.20150623.gappssmtp.com header.s=20150623 header.b=C9HB4SED; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=iitr.ac.in Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728576AbgFZNHd (ORCPT + 99 others); Fri, 26 Jun 2020 09:07:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728539AbgFZNHb (ORCPT ); Fri, 26 Jun 2020 09:07:31 -0400 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48D32C08C5DC for ; Fri, 26 Jun 2020 06:07:30 -0700 (PDT) Received: by mail-pg1-x544.google.com with SMTP id r18so4929421pgk.11 for ; Fri, 26 Jun 2020 06:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NRJmV6QfNACg/W2qGdUyNfNSRYBISUhip+jiANXSZ2U=; b=C9HB4SEDS2B7u1kQDaipaFKfr7hH6OpplX5jWV8b6ZHCBND/tTgHL6PVf6dHc2f6Sd 5NwS88iK75iPQfV7AefXxKkZOxPRxLwWEQjCL2ilZmNqOTbRoSkptL8QMnJdDAIVeRD8 n8z4n9oY6FvqHnciDAL0ikMjWBqBzo1nvpu+HHTyY1ba1ezjuZpKQ89Q8DkJTmpTwAJK n/UJRXb5+sF3xQ5DZxE6IXuuzbxNRP4C4YmCHtIzLcJXurLDofQ1WpMpCnFf5NsKYKRQ pq1YYaML6SWB/bOkxZa0v0nWkuGFtu0jdeK2Xh01GNjzyWjkExubOZnfEj8hR1uWZtjp X0Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NRJmV6QfNACg/W2qGdUyNfNSRYBISUhip+jiANXSZ2U=; b=EcvQHWrqXkwl4fqy3BVzX2uMWc5JhxUPVeehBry3NNMHRNG3++Ge/pG+uXJ7GOljX5 CUl1xzSU94KF34ufxVRRJ8J9e/RUR4loO6aKVGgCTtbPdvOWts77/b8qSZ/MDPxr7TuJ CzItPAijrVpXMp9xc2STeW7dnegJYrpdmFWWPdFk70lPeazKhf99fSXaPDy1k+yrZFB1 yrEmN5QzBWDrzeI2YTz5x1ZoupVsRB/yKasiw+ku6vFiRahh9Py6Ciuirg8ZTDUFeYXw iJ5newVakb8tZS7ovjxVq0GFabbJ4O55J7i66EblV33ME61079a7//joAZytwDUsxUGw Yiww== X-Gm-Message-State: AOAM533m7bVCOtwAMXw74MBMwu7G7IzGmivxraTcNDCG+IpQOH7GlRk2 GEGTgs2ceyJ141oi8UQvmK/9gw== X-Received: by 2002:a63:5b07:: with SMTP id p7mr2633032pgb.250.1593176849698; Fri, 26 Jun 2020 06:07:29 -0700 (PDT) Received: from kaaira-HP-Pavilion-Notebook ([103.113.213.178]) by smtp.gmail.com with ESMTPSA id z14sm26023750pfj.64.2020.06.26.06.07.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 06:07:29 -0700 (PDT) From: Kaaira Gupta To: Helen Koike , Shuah Khan , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Kieran Bingham , hverkuil@xs4all.nl Cc: Kaaira Gupta Subject: [PATCH v7 3/3] media: vimc: Add a control to display info on test image Date: Fri, 26 Jun 2020 18:37:00 +0530 Message-Id: <20200626130700.2453-4-kgupta@es.iitr.ac.in> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200626130700.2453-1-kgupta@es.iitr.ac.in> References: <20200626130700.2453-1-kgupta@es.iitr.ac.in> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 | 70 +++++++++++++++++++ 4 files changed, 83 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..4b0ae6f51d76 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, "could not find font\n"); + 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..9e4fb3f4d60d 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; @@ -187,8 +189,54 @@ static void *vimc_sen_process_frame(struct vimc_ent_device *ved, { struct vimc_sen_device *vsen = container_of(ved, struct vimc_sen_device, ved); + enum osd_mode {OSD_SHOW_ALL = 0, OSD_SHOW_COUNTERS = 1, OSD_SHOW_NONE = 2}; + const unsigned int line_height = 16; + u8 *basep[TPG_MAX_PLANES][2]; + unsigned int line = 1; + char str[100]; tpg_fill_plane_buffer(&vsen->tpg, 0, 0, vsen->frame); + tpg_calc_text_basep(&vsen->tpg, basep, 0, vsen->frame); + switch (vsen->osd_mode) { + case 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); + } + case 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); + break; + } + case OSD_SHOW_NONE: + default: + break; + } + return vsen->frame; } @@ -201,6 +249,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 +319,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 +360,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 +392,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, -- 2.17.1