media: vimc: Add a control to display info on test image
Add a control in VIMC to display information such as the correct order of colors for a given test pattern, counter, brightness, hue, saturation, contrast, width and height at sensor over test image. Signed-off-by: Kaaira Gupta <kgupta@es.iitr.ac.in> Acked-by: Helen Koike <helen.koike@collabora.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
parent
7a785081a1
commit
5f3fb5c54d
|
@ -2,6 +2,8 @@
|
||||||
config VIDEO_VIMC
|
config VIDEO_VIMC
|
||||||
tristate "Virtual Media Controller Driver (VIMC)"
|
tristate "Virtual Media Controller Driver (VIMC)"
|
||||||
depends on VIDEO_DEV && VIDEO_V4L2
|
depends on VIDEO_DEV && VIDEO_V4L2
|
||||||
|
select FONT_SUPPORT
|
||||||
|
select FONT_8x16
|
||||||
select MEDIA_CONTROLLER
|
select MEDIA_CONTROLLER
|
||||||
select VIDEO_V4L2_SUBDEV_API
|
select VIDEO_V4L2_SUBDEV_API
|
||||||
select VIDEOBUF2_VMALLOC
|
select VIDEOBUF2_VMALLOC
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#define VIMC_CID_VIMC_CLASS (0x00f00000 | 1)
|
#define VIMC_CID_VIMC_CLASS (0x00f00000 | 1)
|
||||||
#define VIMC_CID_TEST_PATTERN (VIMC_CID_VIMC_BASE + 0)
|
#define VIMC_CID_TEST_PATTERN (VIMC_CID_VIMC_BASE + 0)
|
||||||
#define VIMC_CID_MEAN_WIN_SIZE (VIMC_CID_VIMC_BASE + 1)
|
#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_WIDTH 4096
|
||||||
#define VIMC_FRAME_MAX_HEIGHT 2160
|
#define VIMC_FRAME_MAX_HEIGHT 2160
|
||||||
|
|
|
@ -5,10 +5,12 @@
|
||||||
* Copyright (C) 2015-2017 Helen Koike <helen.fornazier@gmail.com>
|
* Copyright (C) 2015-2017 Helen Koike <helen.fornazier@gmail.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <linux/font.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <media/media-device.h>
|
#include <media/media-device.h>
|
||||||
|
#include <media/tpg/v4l2-tpg.h>
|
||||||
#include <media/v4l2-device.h>
|
#include <media/v4l2-device.h>
|
||||||
|
|
||||||
#include "vimc-common.h"
|
#include "vimc-common.h"
|
||||||
|
@ -263,11 +265,19 @@ err_v4l2_unregister:
|
||||||
|
|
||||||
static int vimc_probe(struct platform_device *pdev)
|
static int vimc_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
|
const struct font_desc *font = find_font("VGA8x16");
|
||||||
struct vimc_device *vimc;
|
struct vimc_device *vimc;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
dev_dbg(&pdev->dev, "probe");
|
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);
|
vimc = kzalloc(sizeof(*vimc), GFP_KERNEL);
|
||||||
if (!vimc)
|
if (!vimc)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
|
@ -14,11 +14,19 @@
|
||||||
|
|
||||||
#include "vimc-common.h"
|
#include "vimc-common.h"
|
||||||
|
|
||||||
|
enum vimc_sen_osd_mode {
|
||||||
|
VIMC_SEN_OSD_SHOW_ALL = 0,
|
||||||
|
VIMC_SEN_OSD_SHOW_COUNTERS = 1,
|
||||||
|
VIMC_SEN_OSD_SHOW_NONE = 2
|
||||||
|
};
|
||||||
|
|
||||||
struct vimc_sen_device {
|
struct vimc_sen_device {
|
||||||
struct vimc_ent_device ved;
|
struct vimc_ent_device ved;
|
||||||
struct v4l2_subdev sd;
|
struct v4l2_subdev sd;
|
||||||
struct tpg_data tpg;
|
struct tpg_data tpg;
|
||||||
u8 *frame;
|
u8 *frame;
|
||||||
|
enum vimc_sen_osd_mode osd_value;
|
||||||
|
u64 start_stream_ts;
|
||||||
/* The active format */
|
/* The active format */
|
||||||
struct v4l2_mbus_framefmt mbus_format;
|
struct v4l2_mbus_framefmt mbus_format;
|
||||||
struct v4l2_ctrl_handler hdl;
|
struct v4l2_ctrl_handler hdl;
|
||||||
|
@ -187,8 +195,49 @@ static void *vimc_sen_process_frame(struct vimc_ent_device *ved,
|
||||||
{
|
{
|
||||||
struct vimc_sen_device *vsen = container_of(ved, struct vimc_sen_device,
|
struct vimc_sen_device *vsen = container_of(ved, struct vimc_sen_device,
|
||||||
ved);
|
ved);
|
||||||
|
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_fill_plane_buffer(&vsen->tpg, 0, 0, vsen->frame);
|
||||||
|
tpg_calc_text_basep(&vsen->tpg, basep, 0, vsen->frame);
|
||||||
|
switch (vsen->osd_value) {
|
||||||
|
case VIMC_SEN_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);
|
||||||
|
fallthrough;
|
||||||
|
}
|
||||||
|
case VIMC_SEN_OSD_SHOW_COUNTERS: {
|
||||||
|
unsigned int ms;
|
||||||
|
|
||||||
|
ms = div_u64(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 VIMC_SEN_OSD_SHOW_NONE:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
return vsen->frame;
|
return vsen->frame;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -201,6 +250,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)
|
||||||
const struct vimc_pix_map *vpix;
|
const struct vimc_pix_map *vpix;
|
||||||
unsigned int frame_size;
|
unsigned int frame_size;
|
||||||
|
|
||||||
|
vsen->start_stream_ts = ktime_get_ns();
|
||||||
|
|
||||||
/* Calculate the frame size */
|
/* Calculate the frame size */
|
||||||
vpix = vimc_pix_map_by_code(vsen->mbus_format.code);
|
vpix = vimc_pix_map_by_code(vsen->mbus_format.code);
|
||||||
frame_size = vsen->mbus_format.width * vpix->bpp *
|
frame_size = vsen->mbus_format.width * vpix->bpp *
|
||||||
|
@ -269,6 +320,9 @@ static int vimc_sen_s_ctrl(struct v4l2_ctrl *ctrl)
|
||||||
case V4L2_CID_SATURATION:
|
case V4L2_CID_SATURATION:
|
||||||
tpg_s_saturation(&vsen->tpg, ctrl->val);
|
tpg_s_saturation(&vsen->tpg, ctrl->val);
|
||||||
break;
|
break;
|
||||||
|
case VIMC_CID_OSD_TEXT_MODE:
|
||||||
|
vsen->osd_value = ctrl->val;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
@ -307,6 +361,22 @@ static const struct v4l2_ctrl_config vimc_sen_ctrl_test_pattern = {
|
||||||
.qmenu = tpg_pattern_strings,
|
.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,
|
static struct vimc_ent_device *vimc_sen_add(struct vimc_device *vimc,
|
||||||
const char *vcfg_name)
|
const char *vcfg_name)
|
||||||
{
|
{
|
||||||
|
@ -323,6 +393,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_class, NULL);
|
||||||
v4l2_ctrl_new_custom(&vsen->hdl, &vimc_sen_ctrl_test_pattern, 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_ctrl_new_std(&vsen->hdl, &vimc_sen_ctrl_ops,
|
||||||
V4L2_CID_VFLIP, 0, 1, 1, 0);
|
V4L2_CID_VFLIP, 0, 1, 1, 0);
|
||||||
v4l2_ctrl_new_std(&vsen->hdl, &vimc_sen_ctrl_ops,
|
v4l2_ctrl_new_std(&vsen->hdl, &vimc_sen_ctrl_ops,
|
||||||
|
|
Loading…
Reference in New Issue