summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main.c32
-rw-r--r--media.c20
-rw-r--r--media.h18
3 files changed, 35 insertions, 35 deletions
diff --git a/main.c b/main.c
index 4bc0d39..aa4ced0 100644
--- a/main.c
+++ b/main.c
@@ -230,7 +230,7 @@ static void media_print_topology_dot(struct media_device *media)
}
for (j = 0; j < entity->num_links; j++) {
- struct media_entity_link *link = &entity->links[j];
+ struct media_link *link = &entity->links[j];
if (link->source->entity != entity)
continue;
@@ -275,7 +275,7 @@ static void media_print_topology_text(struct media_device *media)
printf("%*cdevice node name %s\n", padding, ' ', entity->devname);
for (j = 0; j < entity->info.pads; j++) {
- struct media_entity_pad *pad = &entity->pads[j];
+ struct media_pad *pad = &entity->pads[j];
printf("\tpad%u: %s ", j, media_pad_type_to_string(pad->flags));
@@ -285,7 +285,7 @@ static void media_print_topology_text(struct media_device *media)
printf("\n");
for (k = 0; k < entity->num_links; k++) {
- struct media_entity_link *link = &entity->links[k];
+ struct media_link *link = &entity->links[k];
if (link->source->entity != entity ||
link->source->index != j)
@@ -318,7 +318,7 @@ void media_print_topology(struct media_device *media, int dot)
* Links setup
*/
-static struct media_entity_pad *parse_pad(struct media_device *media, const char *p, char **endp)
+static struct media_pad *parse_pad(struct media_device *media, const char *p, char **endp)
{
unsigned int entity_id, pad;
struct media_entity *entity;
@@ -361,11 +361,11 @@ static struct media_entity_pad *parse_pad(struct media_device *media, const char
return &entity->pads[pad];
}
-static struct media_entity_link *parse_link(struct media_device *media, const char *p, char **endp)
+static struct media_link *parse_link(struct media_device *media, const char *p, char **endp)
{
- struct media_entity_link *link;
- struct media_entity_pad *source;
- struct media_entity_pad *sink;
+ struct media_link *link;
+ struct media_pad *source;
+ struct media_pad *sink;
unsigned int i;
char *end;
@@ -395,7 +395,7 @@ static struct media_entity_link *parse_link(struct media_device *media, const ch
static int setup_link(struct media_device *media, const char *p, char **endp)
{
- struct media_entity_link *link;
+ struct media_link *link;
__u32 flags;
char *end;
@@ -528,11 +528,11 @@ static int parse_frame_interval(struct v4l2_fract *interval, const char *p, char
return 0;
}
-static struct media_entity_pad *parse_pad_format(struct media_device *media,
+static struct media_pad *parse_pad_format(struct media_device *media,
struct v4l2_mbus_framefmt *format, struct v4l2_rect *crop,
struct v4l2_fract *interval, const char *p, char **endp)
{
- struct media_entity_pad *pad;
+ struct media_pad *pad;
char *end;
int ret;
@@ -579,7 +579,7 @@ static struct media_entity_pad *parse_pad_format(struct media_device *media,
return pad;
}
-static int set_format(struct media_entity_pad *pad, struct v4l2_mbus_framefmt *format)
+static int set_format(struct media_pad *pad, struct v4l2_mbus_framefmt *format)
{
int ret;
@@ -603,7 +603,7 @@ static int set_format(struct media_entity_pad *pad, struct v4l2_mbus_framefmt *f
return 0;
}
-static int set_crop(struct media_entity_pad *pad, struct v4l2_rect *crop)
+static int set_crop(struct media_pad *pad, struct v4l2_rect *crop)
{
int ret;
@@ -653,7 +653,7 @@ static int set_frame_interval(struct media_entity *entity, struct v4l2_fract *in
static int setup_format(struct media_device *media, const char *p, char **endp)
{
struct v4l2_mbus_framefmt format = { 0, 0, 0 };
- struct media_entity_pad *pad;
+ struct media_pad *pad;
struct v4l2_rect crop = { -1, -1, -1, -1 };
struct v4l2_fract interval = { 0, 0 };
unsigned int i;
@@ -692,7 +692,7 @@ static int setup_format(struct media_device *media, const char *p, char **endp)
*/
if (pad->flags & MEDIA_PAD_FLAG_OUTPUT) {
for (i = 0; i < pad->entity->num_links; ++i) {
- struct media_entity_link *link = &pad->entity->links[i];
+ struct media_link *link = &pad->entity->links[i];
struct v4l2_mbus_framefmt remote_format;
if (!(link->flags & MEDIA_LINK_FLAG_ACTIVE))
@@ -753,7 +753,7 @@ int main(int argc, char **argv)
}
if (media_opts.pad) {
- struct media_entity_pad *pad;
+ struct media_pad *pad;
pad = parse_pad(media, media_opts.pad, NULL);
if (pad == NULL) {
diff --git a/media.c b/media.c
index b88c8c9..5508775 100644
--- a/media.c
+++ b/media.c
@@ -37,7 +37,7 @@
/*
* media_entity_remote_pad -
*/
-struct media_entity_pad *media_entity_remote_source(struct media_entity_pad *pad)
+struct media_pad *media_entity_remote_source(struct media_pad *pad)
{
unsigned int i;
@@ -45,7 +45,7 @@ struct media_entity_pad *media_entity_remote_source(struct media_entity_pad *pad
return NULL;
for (i = 0; i < pad->entity->num_links; ++i) {
- struct media_entity_link *link = &pad->entity->links[i];
+ struct media_link *link = &pad->entity->links[i];
if (!(link->flags & MEDIA_LINK_FLAG_ACTIVE))
continue;
@@ -97,11 +97,11 @@ struct media_entity *media_get_entity_by_id(struct media_device *media,
* media_setup_link -
*/
int media_setup_link(struct media_device *media,
- struct media_entity_pad *source,
- struct media_entity_pad *sink,
+ struct media_pad *source,
+ struct media_pad *sink,
__u32 flags)
{
- struct media_entity_link *link;
+ struct media_link *link;
struct media_link_desc ulink;
unsigned int i;
int ret;
@@ -153,7 +153,7 @@ int media_reset_links(struct media_device *media)
struct media_entity *entity = &media->entities[i];
for (j = 0; j < entity->num_links; j++) {
- struct media_entity_link *link = &entity->links[j];
+ struct media_link *link = &entity->links[j];
if (link->flags & MEDIA_LINK_FLAG_IMMUTABLE ||
link->source->entity != entity)
@@ -169,10 +169,10 @@ int media_reset_links(struct media_device *media)
return 0;
}
-static struct media_entity_link *media_entity_add_link(struct media_entity *entity)
+static struct media_link *media_entity_add_link(struct media_entity *entity)
{
if (entity->num_links >= entity->max_links) {
- struct media_entity_link *links = entity->links;
+ struct media_link *links = entity->links;
unsigned int max_links = entity->max_links * 2;
unsigned int i;
@@ -220,8 +220,8 @@ static int media_enum_links(struct media_device *media)
for (i = 0; i < entity->info.links; ++i) {
struct media_link_desc *link = &links.links[i];
- struct media_entity_link *fwdlink;
- struct media_entity_link *backlink;
+ struct media_link *fwdlink;
+ struct media_link *backlink;
struct media_entity *source;
struct media_entity *sink;
diff --git a/media.h b/media.h
index c7d4cdf..bf5dcb7 100644
--- a/media.h
+++ b/media.h
@@ -22,15 +22,15 @@
#include <linux/media.h>
-struct media_entity_link {
- struct media_entity_pad *source;
- struct media_entity_pad *sink;
- struct media_entity_link *twin;
+struct media_link {
+ struct media_pad *source;
+ struct media_pad *sink;
+ struct media_link *twin;
__u32 flags;
__u32 padding[3];
};
-struct media_entity_pad {
+struct media_pad {
struct media_entity *entity;
__u32 index;
__u32 flags;
@@ -39,8 +39,8 @@ struct media_entity_pad {
struct media_entity {
struct media_entity_desc info;
- struct media_entity_pad *pads;
- struct media_entity_link *links;
+ struct media_pad *pads;
+ struct media_link *links;
unsigned int max_links;
unsigned int num_links;
@@ -59,7 +59,7 @@ struct media_device {
struct media_device *media_open(const char *name, int verbose);
void media_close(struct media_device *media);
-struct media_entity_pad *media_entity_remote_source(struct media_entity_pad *pad);
+struct media_pad *media_entity_remote_source(struct media_pad *pad);
static inline unsigned int media_entity_type(struct media_entity *entity)
{
@@ -71,7 +71,7 @@ struct media_entity *media_get_entity_by_name(struct media_device *media,
struct media_entity *media_get_entity_by_id(struct media_device *media,
__u32 id);
int media_setup_link(struct media_device *media,
- struct media_entity_pad *source, struct media_entity_pad *sink,
+ struct media_pad *source, struct media_pad *sink,
__u32 flags);
int media_reset_links(struct media_device *media);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 05:02:50 +0000