Commit 5ba0ae43 authored by Helen Fornazier's avatar Helen Fornazier Committed by Mauro Carvalho Chehab

[media] vimc: Move common code from the core

Remove helper functions from vimc-core and add it in vimc-common to
clean up the core.
Signed-off-by: default avatarHelen Koike <helen.koike@collabora.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 554946c3
vimc-objs := vimc-core.o vimc-capture.o vimc-sensor.o vimc-objs := vimc-core.o vimc-capture.o vimc-common.o vimc-sensor.o
obj-$(CONFIG_VIDEO_VIMC) += vimc.o obj-$(CONFIG_VIDEO_VIMC) += vimc.o
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#ifndef _VIMC_CAPTURE_H_ #ifndef _VIMC_CAPTURE_H_
#define _VIMC_CAPTURE_H_ #define _VIMC_CAPTURE_H_
#include "vimc-core.h" #include "vimc-common.h"
struct vimc_ent_device *vimc_cap_create(struct v4l2_device *v4l2_dev, struct vimc_ent_device *vimc_cap_create(struct v4l2_device *v4l2_dev,
const char *const name, const char *const name,
......
/*
* vimc-common.c Virtual Media Controller Driver
*
* Copyright (C) 2015-2017 Helen Koike <helen.fornazier@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include "vimc-common.h"
static const struct vimc_pix_map vimc_pix_map_list[] = {
/* TODO: add all missing formats */
/* RGB formats */
{
.code = MEDIA_BUS_FMT_BGR888_1X24,
.pixelformat = V4L2_PIX_FMT_BGR24,
.bpp = 3,
},
{
.code = MEDIA_BUS_FMT_RGB888_1X24,
.pixelformat = V4L2_PIX_FMT_RGB24,
.bpp = 3,
},
{
.code = MEDIA_BUS_FMT_ARGB8888_1X32,
.pixelformat = V4L2_PIX_FMT_ARGB32,
.bpp = 4,
},
/* Bayer formats */
{
.code = MEDIA_BUS_FMT_SBGGR8_1X8,
.pixelformat = V4L2_PIX_FMT_SBGGR8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGBRG8_1X8,
.pixelformat = V4L2_PIX_FMT_SGBRG8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGRBG8_1X8,
.pixelformat = V4L2_PIX_FMT_SGRBG8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SRGGB8_1X8,
.pixelformat = V4L2_PIX_FMT_SRGGB8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SBGGR10_1X10,
.pixelformat = V4L2_PIX_FMT_SBGGR10,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SGBRG10_1X10,
.pixelformat = V4L2_PIX_FMT_SGBRG10,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SGRBG10_1X10,
.pixelformat = V4L2_PIX_FMT_SGRBG10,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SRGGB10_1X10,
.pixelformat = V4L2_PIX_FMT_SRGGB10,
.bpp = 2,
},
/* 10bit raw bayer a-law compressed to 8 bits */
{
.code = MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8,
.pixelformat = V4L2_PIX_FMT_SBGGR10ALAW8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8,
.pixelformat = V4L2_PIX_FMT_SGBRG10ALAW8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8,
.pixelformat = V4L2_PIX_FMT_SGRBG10ALAW8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8,
.pixelformat = V4L2_PIX_FMT_SRGGB10ALAW8,
.bpp = 1,
},
/* 10bit raw bayer DPCM compressed to 8 bits */
{
.code = MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8,
.pixelformat = V4L2_PIX_FMT_SBGGR10DPCM8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8,
.pixelformat = V4L2_PIX_FMT_SGBRG10DPCM8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
.pixelformat = V4L2_PIX_FMT_SGRBG10DPCM8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8,
.pixelformat = V4L2_PIX_FMT_SRGGB10DPCM8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SBGGR12_1X12,
.pixelformat = V4L2_PIX_FMT_SBGGR12,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SGBRG12_1X12,
.pixelformat = V4L2_PIX_FMT_SGBRG12,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SGRBG12_1X12,
.pixelformat = V4L2_PIX_FMT_SGRBG12,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SRGGB12_1X12,
.pixelformat = V4L2_PIX_FMT_SRGGB12,
.bpp = 2,
},
};
const struct vimc_pix_map *vimc_pix_map_by_code(u32 code)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(vimc_pix_map_list); i++) {
if (vimc_pix_map_list[i].code == code)
return &vimc_pix_map_list[i];
}
return NULL;
}
const struct vimc_pix_map *vimc_pix_map_by_pixelformat(u32 pixelformat)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(vimc_pix_map_list); i++) {
if (vimc_pix_map_list[i].pixelformat == pixelformat)
return &vimc_pix_map_list[i];
}
return NULL;
}
int vimc_propagate_frame(struct media_pad *src, const void *frame)
{
struct media_link *link;
if (!(src->flags & MEDIA_PAD_FL_SOURCE))
return -EINVAL;
/* Send this frame to all sink pads that are direct linked */
list_for_each_entry(link, &src->entity->links, list) {
if (link->source == src &&
(link->flags & MEDIA_LNK_FL_ENABLED)) {
struct vimc_ent_device *ved = NULL;
struct media_entity *entity = link->sink->entity;
if (is_media_entity_v4l2_subdev(entity)) {
struct v4l2_subdev *sd =
container_of(entity, struct v4l2_subdev,
entity);
ved = v4l2_get_subdevdata(sd);
} else if (is_media_entity_v4l2_video_device(entity)) {
struct video_device *vdev =
container_of(entity,
struct video_device,
entity);
ved = video_get_drvdata(vdev);
}
if (ved && ved->process_frame)
ved->process_frame(ved, link->sink, frame);
}
}
return 0;
}
/* Helper function to allocate and initialize pads */
struct media_pad *vimc_pads_init(u16 num_pads, const unsigned long *pads_flag)
{
struct media_pad *pads;
unsigned int i;
/* Allocate memory for the pads */
pads = kcalloc(num_pads, sizeof(*pads), GFP_KERNEL);
if (!pads)
return ERR_PTR(-ENOMEM);
/* Initialize the pads */
for (i = 0; i < num_pads; i++) {
pads[i].index = i;
pads[i].flags = pads_flag[i];
}
return pads;
}
/* /*
* vimc-core.h Virtual Media Controller Driver * vimc-ccommon.h Virtual Media Controller Driver
* *
* Copyright (C) 2015-2017 Helen Koike <helen.fornazier@gmail.com> * Copyright (C) 2015-2017 Helen Koike <helen.fornazier@gmail.com>
* *
...@@ -15,10 +15,11 @@ ...@@ -15,10 +15,11 @@
* *
*/ */
#ifndef _VIMC_CORE_H_ #ifndef _VIMC_COMMON_H_
#define _VIMC_CORE_H_ #define _VIMC_COMMON_H_
#include <linux/slab.h> #include <linux/slab.h>
#include <media/media-device.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
/** /**
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include "vimc-capture.h" #include "vimc-capture.h"
#include "vimc-core.h" #include "vimc-common.h"
#include "vimc-sensor.h" #include "vimc-sensor.h"
#define VIMC_PDEV_NAME "vimc" #define VIMC_PDEV_NAME "vimc"
...@@ -197,189 +197,6 @@ static const struct vimc_pipeline_config pipe_cfg = { ...@@ -197,189 +197,6 @@ static const struct vimc_pipeline_config pipe_cfg = {
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
static const struct vimc_pix_map vimc_pix_map_list[] = {
/* TODO: add all missing formats */
/* RGB formats */
{
.code = MEDIA_BUS_FMT_BGR888_1X24,
.pixelformat = V4L2_PIX_FMT_BGR24,
.bpp = 3,
},
{
.code = MEDIA_BUS_FMT_RGB888_1X24,
.pixelformat = V4L2_PIX_FMT_RGB24,
.bpp = 3,
},
{
.code = MEDIA_BUS_FMT_ARGB8888_1X32,
.pixelformat = V4L2_PIX_FMT_ARGB32,
.bpp = 4,
},
/* Bayer formats */
{
.code = MEDIA_BUS_FMT_SBGGR8_1X8,
.pixelformat = V4L2_PIX_FMT_SBGGR8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGBRG8_1X8,
.pixelformat = V4L2_PIX_FMT_SGBRG8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGRBG8_1X8,
.pixelformat = V4L2_PIX_FMT_SGRBG8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SRGGB8_1X8,
.pixelformat = V4L2_PIX_FMT_SRGGB8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SBGGR10_1X10,
.pixelformat = V4L2_PIX_FMT_SBGGR10,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SGBRG10_1X10,
.pixelformat = V4L2_PIX_FMT_SGBRG10,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SGRBG10_1X10,
.pixelformat = V4L2_PIX_FMT_SGRBG10,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SRGGB10_1X10,
.pixelformat = V4L2_PIX_FMT_SRGGB10,
.bpp = 2,
},
/* 10bit raw bayer a-law compressed to 8 bits */
{
.code = MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8,
.pixelformat = V4L2_PIX_FMT_SBGGR10ALAW8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8,
.pixelformat = V4L2_PIX_FMT_SGBRG10ALAW8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8,
.pixelformat = V4L2_PIX_FMT_SGRBG10ALAW8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8,
.pixelformat = V4L2_PIX_FMT_SRGGB10ALAW8,
.bpp = 1,
},
/* 10bit raw bayer DPCM compressed to 8 bits */
{
.code = MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8,
.pixelformat = V4L2_PIX_FMT_SBGGR10DPCM8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8,
.pixelformat = V4L2_PIX_FMT_SGBRG10DPCM8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
.pixelformat = V4L2_PIX_FMT_SGRBG10DPCM8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8,
.pixelformat = V4L2_PIX_FMT_SRGGB10DPCM8,
.bpp = 1,
},
{
.code = MEDIA_BUS_FMT_SBGGR12_1X12,
.pixelformat = V4L2_PIX_FMT_SBGGR12,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SGBRG12_1X12,
.pixelformat = V4L2_PIX_FMT_SGBRG12,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SGRBG12_1X12,
.pixelformat = V4L2_PIX_FMT_SGRBG12,
.bpp = 2,
},
{
.code = MEDIA_BUS_FMT_SRGGB12_1X12,
.pixelformat = V4L2_PIX_FMT_SRGGB12,
.bpp = 2,
},
};
const struct vimc_pix_map *vimc_pix_map_by_code(u32 code)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(vimc_pix_map_list); i++) {
if (vimc_pix_map_list[i].code == code)
return &vimc_pix_map_list[i];
}
return NULL;
}
const struct vimc_pix_map *vimc_pix_map_by_pixelformat(u32 pixelformat)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(vimc_pix_map_list); i++) {
if (vimc_pix_map_list[i].pixelformat == pixelformat)
return &vimc_pix_map_list[i];
}
return NULL;
}
int vimc_propagate_frame(struct media_pad *src, const void *frame)
{
struct media_link *link;
if (!(src->flags & MEDIA_PAD_FL_SOURCE))
return -EINVAL;
/* Send this frame to all sink pads that are direct linked */
list_for_each_entry(link, &src->entity->links, list) {
if (link->source == src &&
(link->flags & MEDIA_LNK_FL_ENABLED)) {
struct vimc_ent_device *ved = NULL;
struct media_entity *entity = link->sink->entity;
if (is_media_entity_v4l2_subdev(entity)) {
struct v4l2_subdev *sd =
container_of(entity, struct v4l2_subdev,
entity);
ved = v4l2_get_subdevdata(sd);
} else if (is_media_entity_v4l2_video_device(entity)) {
struct video_device *vdev =
container_of(entity,
struct video_device,
entity);
ved = video_get_drvdata(vdev);
}
if (ved && ved->process_frame)
ved->process_frame(ved, link->sink, frame);
}
}
return 0;
}
static void vimc_device_unregister(struct vimc_device *vimc) static void vimc_device_unregister(struct vimc_device *vimc)
{ {
unsigned int i; unsigned int i;
...@@ -396,26 +213,6 @@ static void vimc_device_unregister(struct vimc_device *vimc) ...@@ -396,26 +213,6 @@ static void vimc_device_unregister(struct vimc_device *vimc)
media_device_cleanup(&vimc->mdev); media_device_cleanup(&vimc->mdev);
} }
/* Helper function to allocate and initialize pads */
struct media_pad *vimc_pads_init(u16 num_pads, const unsigned long *pads_flag)
{
struct media_pad *pads;
unsigned int i;
/* Allocate memory for the pads */
pads = kcalloc(num_pads, sizeof(*pads), GFP_KERNEL);
if (!pads)
return ERR_PTR(-ENOMEM);
/* Initialize the pads */
for (i = 0; i < num_pads; i++) {
pads[i].index = i;
pads[i].flags = pads_flag[i];
}
return pads;
}
/* /*
* TODO: remove this function when all the * TODO: remove this function when all the
* entities specific code are implemented * entities specific code are implemented
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#ifndef _VIMC_SENSOR_H_ #ifndef _VIMC_SENSOR_H_
#define _VIMC_SENSOR_H_ #define _VIMC_SENSOR_H_
#include "vimc-core.h" #include "vimc-common.h"
struct vimc_ent_device *vimc_sen_create(struct v4l2_device *v4l2_dev, struct vimc_ent_device *vimc_sen_create(struct v4l2_device *v4l2_dev,
const char *const name, const char *const name,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment