diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-08-14 18:50:08 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-11 17:18:42 +0300 |
| commit | 18710dc67a433ed2c3ecaaffefd8e34502e53262 (patch) | |
| tree | 641ab8210e297bb165a53536035d23d3e1df7dd5 /include/media/media-entity.h | |
| parent | bfab2aacccfc144e2cceccb71ec89f1eff1b8c51 (diff) | |
| download | linux-18710dc67a433ed2c3ecaaffefd8e34502e53262.tar.xz | |
[media] media: use media_gobj inside pads
PADs also need unique object IDs that won't conflict with
the entity object IDs.
The pad objects are currently created via media_entity_init()
and, once created, never change.
While this will likely change in the future in order to
support dynamic changes, for now we'll keep PADs as arrays
and initialize the media_gobj embedded structs when
registering the entity.
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/media/media-entity.h')
| -rw-r--r-- | include/media/media-entity.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/media-entity.h b/include/media/media-entity.h index 4faa4d830da4..b91c78d34f79 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -34,9 +34,11 @@ * enum media_gobj_type - type of a graph object * * @MEDIA_GRAPH_ENTITY: Identify a media entity + * @MEDIA_GRAPH_PAD: Identify a media pad */ enum media_gobj_type { MEDIA_GRAPH_ENTITY, + MEDIA_GRAPH_PAD, }; #define MEDIA_BITS_PER_TYPE 8 @@ -72,6 +74,7 @@ struct media_link { }; struct media_pad { + struct media_gobj graph_obj; struct media_entity *entity; /* Entity this pad belongs to */ u16 index; /* Pad index in the entity pads array */ unsigned long flags; /* Pad flags (MEDIA_PAD_FL_*) */ |