| Message ID | 1453133860-21571-6-git-send-email-j.anaszewski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Jacek, Jacek Anaszewski wrote: > Add new graph helpers useful for video pipeline discovering. > > Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> > Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > utils/media-ctl/libmediactl.c | 48 +++++++++++++++++++++++++++++++++++++++++ > utils/media-ctl/mediactl.h | 36 +++++++++++++++++++++++++++++++ > 2 files changed, 84 insertions(+) > > diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c > index 61b5f50..0be1845 100644 > --- a/utils/media-ctl/libmediactl.c > +++ b/utils/media-ctl/libmediactl.c > @@ -35,6 +35,7 @@ > #include <unistd.h> > > #include <linux/media.h> > +#include <linux/kdev_t.h> > #include <linux/videodev2.h> > > #include "mediactl.h" > @@ -87,6 +88,29 @@ struct media_entity *media_get_entity_by_name(struct media_device *media, > return NULL; > } > > +struct media_entity *media_get_entity_by_devname(struct media_device *media, > + const char *devname, > + size_t length) > +{ > + unsigned int i; > + > + /* A match is impossible if the entity devname is longer than the > + * maximum size we can get from the kernel. > + */ > + if (length >= FIELD_SIZEOF(struct media_entity, devname)) > + return NULL; > + > + for (i = 0; i < media->entities_count; ++i) { > + struct media_entity *entity = &media->entities[i]; > + > + if (strncmp(entity->devname, devname, length) == 0 && > + entity->devname[length] == '\0') > + return entity; > + } > + > + return NULL; > +} Just out of curiosity: where do you need this? I.e. why do you need to translate a device name to an entity? > + > struct media_entity *media_get_entity_by_id(struct media_device *media, > __u32 id) > { > @@ -145,6 +169,11 @@ const char *media_entity_get_devname(struct media_entity *entity) > return entity->devname[0] ? entity->devname : NULL; > } > > +const char *media_entity_get_name(struct media_entity *entity) > +{ > + return entity->info.name; > +} You should instead use media_get_info()->name . If you have an entity, the return value will be valid. > + > struct media_entity *media_get_default_entity(struct media_device *media, > unsigned int type) > { > @@ -177,6 +206,25 @@ const struct media_entity_desc *media_entity_get_info(struct media_entity *entit > return &entity->info; > } > > +int media_get_backlinks_by_entity(struct media_entity *entity, How about calling this media_entity_get_backlinks()? > + struct media_link **backlinks, > + int *num_backlinks) unsigned int. > +{ > + int num_bklinks = 0, i; Same here. > + > + if (entity == NULL || backlinks == NULL || num_backlinks == NULL) > + return -EINVAL; > + > + for (i = 0; i < entity->num_links; ++i) > + if ((entity->links[i].flags & MEDIA_LNK_FL_ENABLED) && > + (entity->links[i].sink->entity == entity)) > + backlinks[num_bklinks++] = &entity->links[i]; > + > + *num_backlinks = num_bklinks; > + > + return 0; > +} > + > /* ----------------------------------------------------------------------------- > * Open/close > */ > diff --git a/utils/media-ctl/mediactl.h b/utils/media-ctl/mediactl.h > index 3faee71..9db40a8 100644 > --- a/utils/media-ctl/mediactl.h > +++ b/utils/media-ctl/mediactl.h > @@ -231,6 +231,15 @@ const struct media_link *media_entity_get_link(struct media_entity *entity, > const char *media_entity_get_devname(struct media_entity *entity); > > /** > + * @brief Get the name for an entity > + * @param entity - media entity. > + * > + * This function returns the name of the entity. > + * > + * @return A pointer to the string with entity name > + */ > +const char *media_entity_get_name(struct media_entity *entity); > + > * @brief Get the type of an entity. > * @param entity - the entity. > * > @@ -255,6 +264,19 @@ struct media_entity *media_get_entity_by_name(struct media_device *media, > const char *name, size_t length); > > /** > + * @brief Find an entity by the corresponding device node name. > + * @param media - media device. > + * @param devname - device node name. > + * @param length - size of @a devname. > + * > + * Search for an entity with a device node name equal to @a devname. > + * > + * @return A pointer to the entity if found, or NULL otherwise. > + */ > +struct media_entity *media_get_entity_by_devname(struct media_device *media, > + const char *devname, size_t length); > + > +/** > * @brief Find an entity by its ID. > * @param media - media device. > * @param id - entity ID. > @@ -434,4 +456,18 @@ int media_parse_setup_link(struct media_device *media, > */ > int media_parse_setup_links(struct media_device *media, const char *p); > > +/** > + * @brief Get entity's enabled backlinks > + * @param entity - media entity. > + * @param backlinks - array of pointers to matching backlinks. > + * @param num_backlinks - number of matching backlinks. > + * > + * Get links that are connected to the entity sink pads. > + * > + * @return 0 on success, or a negative error code on failure. > + */ > +int media_get_backlinks_by_entity(struct media_entity *entity, > + struct media_link **backlinks, > + int *num_backlinks); > + > #endif >
Hi Sakari, Thanks for the review. On 02/15/2016 01:02 PM, Sakari Ailus wrote: > Hi Jacek, > > Jacek Anaszewski wrote: >> Add new graph helpers useful for video pipeline discovering. >> >> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> >> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> >> --- >> utils/media-ctl/libmediactl.c | 48 +++++++++++++++++++++++++++++++++++++++++ >> utils/media-ctl/mediactl.h | 36 +++++++++++++++++++++++++++++++ >> 2 files changed, 84 insertions(+) >> >> diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c >> index 61b5f50..0be1845 100644 >> --- a/utils/media-ctl/libmediactl.c >> +++ b/utils/media-ctl/libmediactl.c >> @@ -35,6 +35,7 @@ >> #include <unistd.h> >> >> #include <linux/media.h> >> +#include <linux/kdev_t.h> >> #include <linux/videodev2.h> >> >> #include "mediactl.h" >> @@ -87,6 +88,29 @@ struct media_entity *media_get_entity_by_name(struct media_device *media, >> return NULL; >> } >> >> +struct media_entity *media_get_entity_by_devname(struct media_device *media, >> + const char *devname, >> + size_t length) >> +{ >> + unsigned int i; >> + >> + /* A match is impossible if the entity devname is longer than the >> + * maximum size we can get from the kernel. >> + */ >> + if (length >= FIELD_SIZEOF(struct media_entity, devname)) >> + return NULL; >> + >> + for (i = 0; i < media->entities_count; ++i) { >> + struct media_entity *entity = &media->entities[i]; >> + >> + if (strncmp(entity->devname, devname, length) == 0 && >> + entity->devname[length] == '\0') >> + return entity; >> + } >> + >> + return NULL; >> +} > > Just out of curiosity: where do you need this? I.e. why do you need to > translate a device name to an entity? It is needed in media_device_new_by_entity_devname() and directly in libv4l-exynos4-camera.c, plugin_init(). Please especially refer to the plugin_init(). You were asking about this in the review of v4 (over one year ago :) ), and I provided an explanation in the following message [1]. >> + >> struct media_entity *media_get_entity_by_id(struct media_device *media, >> __u32 id) >> { >> @@ -145,6 +169,11 @@ const char *media_entity_get_devname(struct media_entity *entity) >> return entity->devname[0] ? entity->devname : NULL; >> } >> >> +const char *media_entity_get_name(struct media_entity *entity) >> +{ >> + return entity->info.name; >> +} > > You should instead use media_get_info()->name . If you have an entity, > the return value will be valid. OK. >> + >> struct media_entity *media_get_default_entity(struct media_device *media, >> unsigned int type) >> { >> @@ -177,6 +206,25 @@ const struct media_entity_desc *media_entity_get_info(struct media_entity *entit >> return &entity->info; >> } >> >> +int media_get_backlinks_by_entity(struct media_entity *entity, > > How about calling this media_entity_get_backlinks()? > >> + struct media_link **backlinks, >> + int *num_backlinks) > > unsigned int. OK. >> +{ >> + int num_bklinks = 0, i; > > Same here. OK. >> + >> + if (entity == NULL || backlinks == NULL || num_backlinks == NULL) >> + return -EINVAL; >> + >> + for (i = 0; i < entity->num_links; ++i) >> + if ((entity->links[i].flags & MEDIA_LNK_FL_ENABLED) && >> + (entity->links[i].sink->entity == entity)) >> + backlinks[num_bklinks++] = &entity->links[i]; >> + >> + *num_backlinks = num_bklinks; >> + >> + return 0; >> +} >> + >> /* ----------------------------------------------------------------------------- >> * Open/close >> */ >> diff --git a/utils/media-ctl/mediactl.h b/utils/media-ctl/mediactl.h >> index 3faee71..9db40a8 100644 >> --- a/utils/media-ctl/mediactl.h >> +++ b/utils/media-ctl/mediactl.h >> @@ -231,6 +231,15 @@ const struct media_link *media_entity_get_link(struct media_entity *entity, >> const char *media_entity_get_devname(struct media_entity *entity); >> >> /** >> + * @brief Get the name for an entity >> + * @param entity - media entity. >> + * >> + * This function returns the name of the entity. >> + * >> + * @return A pointer to the string with entity name >> + */ >> +const char *media_entity_get_name(struct media_entity *entity); >> + >> * @brief Get the type of an entity. >> * @param entity - the entity. >> * >> @@ -255,6 +264,19 @@ struct media_entity *media_get_entity_by_name(struct media_device *media, >> const char *name, size_t length); >> >> /** >> + * @brief Find an entity by the corresponding device node name. >> + * @param media - media device. >> + * @param devname - device node name. >> + * @param length - size of @a devname. >> + * >> + * Search for an entity with a device node name equal to @a devname. >> + * >> + * @return A pointer to the entity if found, or NULL otherwise. >> + */ >> +struct media_entity *media_get_entity_by_devname(struct media_device *media, >> + const char *devname, size_t length); >> + >> +/** >> * @brief Find an entity by its ID. >> * @param media - media device. >> * @param id - entity ID. >> @@ -434,4 +456,18 @@ int media_parse_setup_link(struct media_device *media, >> */ >> int media_parse_setup_links(struct media_device *media, const char *p); >> >> +/** >> + * @brief Get entity's enabled backlinks >> + * @param entity - media entity. >> + * @param backlinks - array of pointers to matching backlinks. >> + * @param num_backlinks - number of matching backlinks. >> + * >> + * Get links that are connected to the entity sink pads. >> + * >> + * @return 0 on success, or a negative error code on failure. >> + */ >> +int media_get_backlinks_by_entity(struct media_entity *entity, >> + struct media_link **backlinks, >> + int *num_backlinks); >> + >> #endif >> > > [1] http://permalink.gmane.org/gmane.linux.drivers.video-input-infrastructure/88446
Hi Jacek, Jacek Anaszewski wrote: > Hi Sakari, > > Thanks for the review. > > On 02/15/2016 01:02 PM, Sakari Ailus wrote: >> Hi Jacek, >> >> Jacek Anaszewski wrote: >>> Add new graph helpers useful for video pipeline discovering. >>> >>> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> >>> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> >>> --- >>> utils/media-ctl/libmediactl.c | 48 >>> +++++++++++++++++++++++++++++++++++++++++ >>> utils/media-ctl/mediactl.h | 36 +++++++++++++++++++++++++++++++ >>> 2 files changed, 84 insertions(+) >>> >>> diff --git a/utils/media-ctl/libmediactl.c >>> b/utils/media-ctl/libmediactl.c >>> index 61b5f50..0be1845 100644 >>> --- a/utils/media-ctl/libmediactl.c >>> +++ b/utils/media-ctl/libmediactl.c >>> @@ -35,6 +35,7 @@ >>> #include <unistd.h> >>> >>> #include <linux/media.h> >>> +#include <linux/kdev_t.h> >>> #include <linux/videodev2.h> >>> >>> #include "mediactl.h" >>> @@ -87,6 +88,29 @@ struct media_entity >>> *media_get_entity_by_name(struct media_device *media, >>> return NULL; >>> } >>> >>> +struct media_entity *media_get_entity_by_devname(struct media_device >>> *media, >>> + const char *devname, >>> + size_t length) >>> +{ >>> + unsigned int i; >>> + >>> + /* A match is impossible if the entity devname is longer than the >>> + * maximum size we can get from the kernel. >>> + */ >>> + if (length >= FIELD_SIZEOF(struct media_entity, devname)) >>> + return NULL; >>> + >>> + for (i = 0; i < media->entities_count; ++i) { >>> + struct media_entity *entity = &media->entities[i]; >>> + >>> + if (strncmp(entity->devname, devname, length) == 0 && >>> + entity->devname[length] == '\0') >>> + return entity; >>> + } >>> + >>> + return NULL; >>> +} >> >> Just out of curiosity: where do you need this? I.e. why do you need to >> translate a device name to an entity? > > It is needed in media_device_new_by_entity_devname() and directly in > libv4l-exynos4-camera.c, plugin_init(). Please especially refer to > the plugin_init(). You were asking about this in the review of v4 > (over one year ago :) ), and I provided an explanation in the > following message [1]. That's a bit long review time indeed. :-P You have the sub-device fd. Obtaining major and minor using fstat, you can find the relevant sub-device in sysfs without having to open all the media devices. Once you have that, you can use the sysfs link to the media device, and obtain the media device major and minor. E.g. $ cat /sys/class/video4linux/v4l-subdev0/dev 81:20 $ cat /sys/class/video4linux/v4l-subdev0/device/media0/dev 248:0 Additionally, you avoid assuming your media devices will be /dev/media*. In sysfs the files are always in the same locations independently of the user space file system layout (with the exception of /sys itself). > >>> + >>> struct media_entity *media_get_entity_by_id(struct media_device >>> *media, >>> __u32 id) >>> { >>> @@ -145,6 +169,11 @@ const char *media_entity_get_devname(struct >>> media_entity *entity) >>> return entity->devname[0] ? entity->devname : NULL; >>> } >>> >>> +const char *media_entity_get_name(struct media_entity *entity) >>> +{ >>> + return entity->info.name; >>> +} >> >> You should instead use media_get_info()->name . If you have an entity, >> the return value will be valid. > > OK. > >>> + >>> struct media_entity *media_get_default_entity(struct media_device >>> *media, >>> unsigned int type) >>> { >>> @@ -177,6 +206,25 @@ const struct media_entity_desc >>> *media_entity_get_info(struct media_entity *entit >>> return &entity->info; >>> } >>> >>> +int media_get_backlinks_by_entity(struct media_entity *entity, >> >> How about calling this media_entity_get_backlinks()? ^ >> >>> + struct media_link **backlinks, >>> + int *num_backlinks) >> >> unsigned int. > > OK. > >>> +{ >>> + int num_bklinks = 0, i; >> >> Same here. > > OK. > >>> + >>> + if (entity == NULL || backlinks == NULL || num_backlinks == NULL) >>> + return -EINVAL; >>> + >>> + for (i = 0; i < entity->num_links; ++i) >>> + if ((entity->links[i].flags & MEDIA_LNK_FL_ENABLED) && >>> + (entity->links[i].sink->entity == entity)) >>> + backlinks[num_bklinks++] = &entity->links[i]; >>> + >>> + *num_backlinks = num_bklinks; >>> + >>> + return 0; >>> +} >>> + >>> /* >>> ----------------------------------------------------------------------------- >>> >>> * Open/close >>> */ >>> diff --git a/utils/media-ctl/mediactl.h b/utils/media-ctl/mediactl.h >>> index 3faee71..9db40a8 100644 >>> --- a/utils/media-ctl/mediactl.h >>> +++ b/utils/media-ctl/mediactl.h >>> @@ -231,6 +231,15 @@ const struct media_link >>> *media_entity_get_link(struct media_entity *entity, >>> const char *media_entity_get_devname(struct media_entity *entity); >>> >>> /** >>> + * @brief Get the name for an entity >>> + * @param entity - media entity. >>> + * >>> + * This function returns the name of the entity. >>> + * >>> + * @return A pointer to the string with entity name >>> + */ >>> +const char *media_entity_get_name(struct media_entity *entity); >>> + >>> * @brief Get the type of an entity. >>> * @param entity - the entity. >>> * >>> @@ -255,6 +264,19 @@ struct media_entity >>> *media_get_entity_by_name(struct media_device *media, >>> const char *name, size_t length); >>> >>> /** >>> + * @brief Find an entity by the corresponding device node name. >>> + * @param media - media device. >>> + * @param devname - device node name. >>> + * @param length - size of @a devname. >>> + * >>> + * Search for an entity with a device node name equal to @a devname. >>> + * >>> + * @return A pointer to the entity if found, or NULL otherwise. >>> + */ >>> +struct media_entity *media_get_entity_by_devname(struct media_device >>> *media, >>> + const char *devname, size_t length); >>> + >>> +/** >>> * @brief Find an entity by its ID. >>> * @param media - media device. >>> * @param id - entity ID. >>> @@ -434,4 +456,18 @@ int media_parse_setup_link(struct media_device >>> *media, >>> */ >>> int media_parse_setup_links(struct media_device *media, const char >>> *p); >>> >>> +/** >>> + * @brief Get entity's enabled backlinks >>> + * @param entity - media entity. >>> + * @param backlinks - array of pointers to matching backlinks. >>> + * @param num_backlinks - number of matching backlinks. >>> + * >>> + * Get links that are connected to the entity sink pads. >>> + * >>> + * @return 0 on success, or a negative error code on failure. >>> + */ >>> +int media_get_backlinks_by_entity(struct media_entity *entity, >>> + struct media_link **backlinks, >>> + int *num_backlinks); >>> + >>> #endif >>> >> >> > > [1] > http://permalink.gmane.org/gmane.linux.drivers.video-input-infrastructure/88446 > >
On 02/15/2016 03:14 PM, Sakari Ailus wrote: > Hi Jacek, > > Jacek Anaszewski wrote: >> Hi Sakari, >> >> Thanks for the review. >> >> On 02/15/2016 01:02 PM, Sakari Ailus wrote: >>> Hi Jacek, >>> >>> Jacek Anaszewski wrote: >>>> Add new graph helpers useful for video pipeline discovering. >>>> >>>> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> >>>> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> >>>> --- >>>> utils/media-ctl/libmediactl.c | 48 >>>> +++++++++++++++++++++++++++++++++++++++++ >>>> utils/media-ctl/mediactl.h | 36 +++++++++++++++++++++++++++++++ >>>> 2 files changed, 84 insertions(+) >>>> >>>> diff --git a/utils/media-ctl/libmediactl.c >>>> b/utils/media-ctl/libmediactl.c >>>> index 61b5f50..0be1845 100644 >>>> --- a/utils/media-ctl/libmediactl.c >>>> +++ b/utils/media-ctl/libmediactl.c >>>> @@ -35,6 +35,7 @@ >>>> #include <unistd.h> >>>> >>>> #include <linux/media.h> >>>> +#include <linux/kdev_t.h> >>>> #include <linux/videodev2.h> >>>> >>>> #include "mediactl.h" >>>> @@ -87,6 +88,29 @@ struct media_entity >>>> *media_get_entity_by_name(struct media_device *media, >>>> return NULL; >>>> } >>>> >>>> +struct media_entity *media_get_entity_by_devname(struct media_device >>>> *media, >>>> + const char *devname, >>>> + size_t length) >>>> +{ >>>> + unsigned int i; >>>> + >>>> + /* A match is impossible if the entity devname is longer than the >>>> + * maximum size we can get from the kernel. >>>> + */ >>>> + if (length >= FIELD_SIZEOF(struct media_entity, devname)) >>>> + return NULL; >>>> + >>>> + for (i = 0; i < media->entities_count; ++i) { >>>> + struct media_entity *entity = &media->entities[i]; >>>> + >>>> + if (strncmp(entity->devname, devname, length) == 0 && >>>> + entity->devname[length] == '\0') >>>> + return entity; >>>> + } >>>> + >>>> + return NULL; >>>> +} >>> >>> Just out of curiosity: where do you need this? I.e. why do you need to >>> translate a device name to an entity? >> >> It is needed in media_device_new_by_entity_devname() and directly in >> libv4l-exynos4-camera.c, plugin_init(). Please especially refer to >> the plugin_init(). You were asking about this in the review of v4 >> (over one year ago :) ), and I provided an explanation in the >> following message [1]. > > That's a bit long review time indeed. :-P > > You have the sub-device fd. Obtaining major and minor using fstat, you > can find the relevant sub-device in sysfs without having to open all the > media devices. Once you have that, you can use the sysfs link to the > media device, and obtain the media device major and minor. > > E.g. > > $ cat /sys/class/video4linux/v4l-subdev0/dev > 81:20 > $ cat /sys/class/video4linux/v4l-subdev0/device/media0/dev > 248:0 > > Additionally, you avoid assuming your media devices will be /dev/media*. > In sysfs the files are always in the same locations independently of the > user space file system layout (with the exception of /sys itself). Thanks for the hints. I'll change the code accordingly. >> >>>> + >>>> struct media_entity *media_get_entity_by_id(struct media_device >>>> *media, >>>> __u32 id) >>>> { >>>> @@ -145,6 +169,11 @@ const char *media_entity_get_devname(struct >>>> media_entity *entity) >>>> return entity->devname[0] ? entity->devname : NULL; >>>> } >>>> >>>> +const char *media_entity_get_name(struct media_entity *entity) >>>> +{ >>>> + return entity->info.name; >>>> +} >>> >>> You should instead use media_get_info()->name . If you have an entity, >>> the return value will be valid. >> >> OK. >> >>>> + >>>> struct media_entity *media_get_default_entity(struct media_device >>>> *media, >>>> unsigned int type) >>>> { >>>> @@ -177,6 +206,25 @@ const struct media_entity_desc >>>> *media_entity_get_info(struct media_entity *entit >>>> return &entity->info; >>>> } >>>> >>>> +int media_get_backlinks_by_entity(struct media_entity *entity, >>> >>> How about calling this media_entity_get_backlinks()? > > ^ Right, it's better. >>> >>>> + struct media_link **backlinks, >>>> + int *num_backlinks) >>> >>> unsigned int. >> >> OK. >> >>>> +{ >>>> + int num_bklinks = 0, i; >>> >>> Same here. >> >> OK. >> >>>> + >>>> + if (entity == NULL || backlinks == NULL || num_backlinks == NULL) >>>> + return -EINVAL; >>>> + >>>> + for (i = 0; i < entity->num_links; ++i) >>>> + if ((entity->links[i].flags & MEDIA_LNK_FL_ENABLED) && >>>> + (entity->links[i].sink->entity == entity)) >>>> + backlinks[num_bklinks++] = &entity->links[i]; >>>> + >>>> + *num_backlinks = num_bklinks; >>>> + >>>> + return 0; >>>> +} >>>> + >>>> /* >>>> ----------------------------------------------------------------------------- >>>> >>>> * Open/close >>>> */ >>>> diff --git a/utils/media-ctl/mediactl.h b/utils/media-ctl/mediactl.h >>>> index 3faee71..9db40a8 100644 >>>> --- a/utils/media-ctl/mediactl.h >>>> +++ b/utils/media-ctl/mediactl.h >>>> @@ -231,6 +231,15 @@ const struct media_link >>>> *media_entity_get_link(struct media_entity *entity, >>>> const char *media_entity_get_devname(struct media_entity *entity); >>>> >>>> /** >>>> + * @brief Get the name for an entity >>>> + * @param entity - media entity. >>>> + * >>>> + * This function returns the name of the entity. >>>> + * >>>> + * @return A pointer to the string with entity name >>>> + */ >>>> +const char *media_entity_get_name(struct media_entity *entity); >>>> + >>>> * @brief Get the type of an entity. >>>> * @param entity - the entity. >>>> * >>>> @@ -255,6 +264,19 @@ struct media_entity >>>> *media_get_entity_by_name(struct media_device *media, >>>> const char *name, size_t length); >>>> >>>> /** >>>> + * @brief Find an entity by the corresponding device node name. >>>> + * @param media - media device. >>>> + * @param devname - device node name. >>>> + * @param length - size of @a devname. >>>> + * >>>> + * Search for an entity with a device node name equal to @a devname. >>>> + * >>>> + * @return A pointer to the entity if found, or NULL otherwise. >>>> + */ >>>> +struct media_entity *media_get_entity_by_devname(struct media_device >>>> *media, >>>> + const char *devname, size_t length); >>>> + >>>> +/** >>>> * @brief Find an entity by its ID. >>>> * @param media - media device. >>>> * @param id - entity ID. >>>> @@ -434,4 +456,18 @@ int media_parse_setup_link(struct media_device >>>> *media, >>>> */ >>>> int media_parse_setup_links(struct media_device *media, const char >>>> *p); >>>> >>>> +/** >>>> + * @brief Get entity's enabled backlinks >>>> + * @param entity - media entity. >>>> + * @param backlinks - array of pointers to matching backlinks. >>>> + * @param num_backlinks - number of matching backlinks. >>>> + * >>>> + * Get links that are connected to the entity sink pads. >>>> + * >>>> + * @return 0 on success, or a negative error code on failure. >>>> + */ >>>> +int media_get_backlinks_by_entity(struct media_entity *entity, >>>> + struct media_link **backlinks, >>>> + int *num_backlinks); >>>> + >>>> #endif >>>> >>> >>> >> >> [1] >> http://permalink.gmane.org/gmane.linux.drivers.video-input-infrastructure/88446 >> >> > >
diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c index 61b5f50..0be1845 100644 --- a/utils/media-ctl/libmediactl.c +++ b/utils/media-ctl/libmediactl.c @@ -35,6 +35,7 @@ #include <unistd.h> #include <linux/media.h> +#include <linux/kdev_t.h> #include <linux/videodev2.h> #include "mediactl.h" @@ -87,6 +88,29 @@ struct media_entity *media_get_entity_by_name(struct media_device *media, return NULL; } +struct media_entity *media_get_entity_by_devname(struct media_device *media, + const char *devname, + size_t length) +{ + unsigned int i; + + /* A match is impossible if the entity devname is longer than the + * maximum size we can get from the kernel. + */ + if (length >= FIELD_SIZEOF(struct media_entity, devname)) + return NULL; + + for (i = 0; i < media->entities_count; ++i) { + struct media_entity *entity = &media->entities[i]; + + if (strncmp(entity->devname, devname, length) == 0 && + entity->devname[length] == '\0') + return entity; + } + + return NULL; +} + struct media_entity *media_get_entity_by_id(struct media_device *media, __u32 id) { @@ -145,6 +169,11 @@ const char *media_entity_get_devname(struct media_entity *entity) return entity->devname[0] ? entity->devname : NULL; } +const char *media_entity_get_name(struct media_entity *entity) +{ + return entity->info.name; +} + struct media_entity *media_get_default_entity(struct media_device *media, unsigned int type) { @@ -177,6 +206,25 @@ const struct media_entity_desc *media_entity_get_info(struct media_entity *entit return &entity->info; } +int media_get_backlinks_by_entity(struct media_entity *entity, + struct media_link **backlinks, + int *num_backlinks) +{ + int num_bklinks = 0, i; + + if (entity == NULL || backlinks == NULL || num_backlinks == NULL) + return -EINVAL; + + for (i = 0; i < entity->num_links; ++i) + if ((entity->links[i].flags & MEDIA_LNK_FL_ENABLED) && + (entity->links[i].sink->entity == entity)) + backlinks[num_bklinks++] = &entity->links[i]; + + *num_backlinks = num_bklinks; + + return 0; +} + /* ----------------------------------------------------------------------------- * Open/close */ diff --git a/utils/media-ctl/mediactl.h b/utils/media-ctl/mediactl.h index 3faee71..9db40a8 100644 --- a/utils/media-ctl/mediactl.h +++ b/utils/media-ctl/mediactl.h @@ -231,6 +231,15 @@ const struct media_link *media_entity_get_link(struct media_entity *entity, const char *media_entity_get_devname(struct media_entity *entity); /** + * @brief Get the name for an entity + * @param entity - media entity. + * + * This function returns the name of the entity. + * + * @return A pointer to the string with entity name + */ +const char *media_entity_get_name(struct media_entity *entity); + * @brief Get the type of an entity. * @param entity - the entity. * @@ -255,6 +264,19 @@ struct media_entity *media_get_entity_by_name(struct media_device *media, const char *name, size_t length); /** + * @brief Find an entity by the corresponding device node name. + * @param media - media device. + * @param devname - device node name. + * @param length - size of @a devname. + * + * Search for an entity with a device node name equal to @a devname. + * + * @return A pointer to the entity if found, or NULL otherwise. + */ +struct media_entity *media_get_entity_by_devname(struct media_device *media, + const char *devname, size_t length); + +/** * @brief Find an entity by its ID. * @param media - media device. * @param id - entity ID. @@ -434,4 +456,18 @@ int media_parse_setup_link(struct media_device *media, */ int media_parse_setup_links(struct media_device *media, const char *p); +/** + * @brief Get entity's enabled backlinks + * @param entity - media entity. + * @param backlinks - array of pointers to matching backlinks. + * @param num_backlinks - number of matching backlinks. + * + * Get links that are connected to the entity sink pads. + * + * @return 0 on success, or a negative error code on failure. + */ +int media_get_backlinks_by_entity(struct media_entity *entity, + struct media_link **backlinks, + int *num_backlinks); + #endif