OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

media: v4l2-mc: switch it to use the new approach to setup pipelines 

Instead of relying on a static map for pids, use the new sig_type
"taint" type to setup the pipelines with the same tipe between
different entities.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2018-07-31 09:22:40 -04:00
parent c1a37dd5e8
commit 9d6d20e652
3 changed files with 106 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/media/media-entity.c
View File

@ -662,6 +662,32 @@ static void __media_entity_remove_link(struct media_entity *entity,
kfree(link); kfree(link);
} }
int media_get_pad_index(struct media_entity *entity, bool is_sink,
enum media_pad_signal_type sig_type)
{
int i;
bool pad_is_sink;
if (!entity)
return -EINVAL;
for (i = 0; i < entity->num_pads; i++) {
if (entity->pads[i].flags == MEDIA_PAD_FL_SINK)
pad_is_sink = true;
else if (entity->pads[i].flags == MEDIA_PAD_FL_SOURCE)
pad_is_sink = false;
else
continue; /* This is an error! */
if (pad_is_sink != is_sink)
continue;
if (entity->pads[i].sig_type == sig_type)
return i;
}
return -EINVAL;
}
EXPORT_SYMBOL_GPL(media_get_pad_index);
int int
media_create_pad_link(struct media_entity *source, u16 source_pad, media_create_pad_link(struct media_entity *source, u16 source_pad,
struct media_entity *sink, u16 sink_pad, u32 flags) struct media_entity *sink, u16 sink_pad, u32 flags)

85
drivers/media/v4l2-core/v4l2-mc.c
View File

@ -28,7 +28,7 @@ int v4l2_mc_create_media_graph(struct media_device *mdev)
struct media_entity *io_v4l = NULL, *io_vbi = NULL, *io_swradio = NULL; struct media_entity *io_v4l = NULL, *io_vbi = NULL, *io_swradio = NULL;
bool is_webcam = false; bool is_webcam = false;
u32 flags; u32 flags;
int ret; int ret, pad_sink, pad_source;
if (!mdev) if (!mdev)
return 0; return 0;
@ -97,29 +97,52 @@ int v4l2_mc_create_media_graph(struct media_device *mdev)
/* Link the tuner and IF video output pads */ /* Link the tuner and IF video output pads */
if (tuner) { if (tuner) {
if (if_vid) { if (if_vid) {
ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT, pad_source = media_get_pad_index(tuner, false,
if_vid, PAD_SIGNAL_ANALOG);
IF_VID_DEC_PAD_IF_INPUT, pad_sink = media_get_pad_index(if_vid, true,
PAD_SIGNAL_ANALOG);
if (pad_source < 0 || pad_sink < 0)
return -EINVAL;
ret = media_create_pad_link(tuner, pad_source,
if_vid, pad_sink,
MEDIA_LNK_FL_ENABLED); MEDIA_LNK_FL_ENABLED);
if (ret) if (ret)
return ret; return ret;
ret = media_create_pad_link(if_vid, IF_VID_DEC_PAD_OUT,
decoder, DEMOD_PAD_IF_INPUT, pad_source = media_get_pad_index(if_vid, false,
MEDIA_LNK_FL_ENABLED); PAD_SIGNAL_ANALOG);
pad_sink = media_get_pad_index(decoder, true,
PAD_SIGNAL_ANALOG);
if (pad_source < 0 || pad_sink < 0)
return -EINVAL;
ret = media_create_pad_link(if_vid, pad_source,
decoder, pad_sink,
MEDIA_LNK_FL_ENABLED);
if (ret) if (ret)
return ret; return ret;
} else { } else {
ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT, pad_source = media_get_pad_index(tuner, false,
decoder, DEMOD_PAD_IF_INPUT, PAD_SIGNAL_ANALOG);
MEDIA_LNK_FL_ENABLED); pad_sink = media_get_pad_index(decoder, true,
PAD_SIGNAL_ANALOG);
if (pad_source < 0 || pad_sink < 0)
return -EINVAL;
ret = media_create_pad_link(tuner, pad_source,
decoder, pad_sink,
MEDIA_LNK_FL_ENABLED);
if (ret) if (ret)
return ret; return ret;
} }
if (if_aud) { if (if_aud) {
ret = media_create_pad_link(tuner, TUNER_PAD_AUD_OUT, pad_source = media_get_pad_index(tuner, false,
if_aud, PAD_SIGNAL_AUDIO);
IF_AUD_DEC_PAD_IF_INPUT, pad_sink = media_get_pad_index(if_aud, true,
PAD_SIGNAL_AUDIO);
if (pad_source < 0 || pad_sink < 0)
return -EINVAL;
ret = media_create_pad_link(tuner, pad_source,
if_aud, pad_sink,
MEDIA_LNK_FL_ENABLED); MEDIA_LNK_FL_ENABLED);
if (ret) if (ret)
return ret; return ret;
@ -131,23 +154,32 @@ int v4l2_mc_create_media_graph(struct media_device *mdev)
/* Create demod to V4L, VBI and SDR radio links */ /* Create demod to V4L, VBI and SDR radio links */
if (io_v4l) { if (io_v4l) {
ret = media_create_pad_link(decoder, DEMOD_PAD_VID_OUT, pad_source = media_get_pad_index(decoder, false, PAD_SIGNAL_DV);
io_v4l, 0, if (pad_source < 0)
MEDIA_LNK_FL_ENABLED); return -EINVAL;
ret = media_create_pad_link(decoder, pad_source,
io_v4l, 0,
MEDIA_LNK_FL_ENABLED);
if (ret) if (ret)
return ret; return ret;
} }
if (io_swradio) { if (io_swradio) {
ret = media_create_pad_link(decoder, DEMOD_PAD_VID_OUT, pad_source = media_get_pad_index(decoder, false, PAD_SIGNAL_DV);
io_swradio, 0, if (pad_source < 0)
MEDIA_LNK_FL_ENABLED); return -EINVAL;
ret = media_create_pad_link(decoder, pad_source,
io_swradio, 0,
MEDIA_LNK_FL_ENABLED);
if (ret) if (ret)
return ret; return ret;
} }
if (io_vbi) { if (io_vbi) {
ret = media_create_pad_link(decoder, DEMOD_PAD_VID_OUT, pad_source = media_get_pad_index(decoder, false, PAD_SIGNAL_DV);
if (pad_source < 0)
return -EINVAL;
ret = media_create_pad_link(decoder, pad_source,
io_vbi, 0, io_vbi, 0,
MEDIA_LNK_FL_ENABLED); MEDIA_LNK_FL_ENABLED);
if (ret) if (ret)
@ -161,15 +193,22 @@ int v4l2_mc_create_media_graph(struct media_device *mdev)
case MEDIA_ENT_F_CONN_RF: case MEDIA_ENT_F_CONN_RF:
if (!tuner) if (!tuner)
continue; continue;
pad_sink = media_get_pad_index(tuner, true,
PAD_SIGNAL_ANALOG);
if (pad_sink < 0)
return -EINVAL;
ret = media_create_pad_link(entity, 0, tuner, ret = media_create_pad_link(entity, 0, tuner,
TUNER_PAD_RF_INPUT, pad_sink,
flags); flags);
break; break;
case MEDIA_ENT_F_CONN_SVIDEO: case MEDIA_ENT_F_CONN_SVIDEO:
case MEDIA_ENT_F_CONN_COMPOSITE: case MEDIA_ENT_F_CONN_COMPOSITE:
pad_sink = media_get_pad_index(decoder, true,
PAD_SIGNAL_ANALOG);
if (pad_sink < 0)
return -EINVAL;
ret = media_create_pad_link(entity, 0, decoder, ret = media_create_pad_link(entity, 0, decoder,
DEMOD_PAD_IF_INPUT, pad_sink,
flags); flags);
break; break;
default: default:

18
include/media/media-entity.h
View File

@ -670,6 +670,24 @@ static inline void media_entity_cleanup(struct media_entity *entity) {}
#define media_entity_cleanup(entity) do { } while (false) #define media_entity_cleanup(entity) do { } while (false)
#endif #endif
/**
* media_get_pad_index() - retrieves a pad index from an entity
*
* @entity: entity where the pads belong
* @is_sink: true if the pad is a sink, false if it is a source
* @sig_type: type of signal of the pad to be search
*
* This helper function finds the first pad index inside an entity that
* satisfies both @is_sink and @sig_type conditions.
*
* Return:
*
* On success, return the pad number. If the pad was not found or the media
* entity is a NULL pointer, return -EINVAL.
*/
int media_get_pad_index(struct media_entity *entity, bool is_sink,
enum media_pad_signal_type sig_type);
/** /**
* media_create_pad_link() - creates a link between two entities. * media_create_pad_link() - creates a link between two entities.
* *