Modify media_entity_remote_pad() to return source pad only
[media-ctl.git] / media.c
diff --git a/media.c b/media.c
index 1bc39e1..0ec5c16 100644 (file)
--- a/media.c
+++ b/media.c
 #include <linux/media.h>
 
 #include "media.h"
-#include "subdev.h"
 #include "tools.h"
 
-static const char *media_entity_type_to_string(unsigned type)
-{
-       static const struct {
-               __u32 type;
-               const char *name;
-       } types[] = {
-               { MEDIA_ENTITY_TYPE_NODE, "Node" },
-               { MEDIA_ENTITY_TYPE_SUBDEV, "V4L2 subdev" },
-       };
-
-       unsigned int i;
-
-       for (i = 0; i < ARRAY_SIZE(types); i++) {
-               if (types[i].type == type)
-                       return types[i].name;
-       }
-
-       return "Unknown";
-}
-
-static const char *media_entity_subtype_to_string(unsigned type, unsigned subtype)
-{
-       static const char *node_types[] = {
-               "Unknown",
-               "V4L",
-               "FB",
-               "ALSA",
-               "DVB",
-       };
-       static const char *subdev_types[] = {
-               "Unknown",
-               "Video Decoder",
-               "Video Encoder",
-               "Miscellaneous",
-       };
-
-       switch (type) {
-       case MEDIA_ENTITY_TYPE_NODE:
-               if (subtype > 4)
-                       subtype = 0;
-               return node_types[subtype];
-
-       case MEDIA_ENTITY_TYPE_SUBDEV:
-               if (subtype > 3)
-                       subtype = 0;
-               return subdev_types[subtype];
-       default:
-               return node_types[0];
-       }
-}
-
-static const char *media_pad_type_to_string(unsigned type)
-{
-       static const struct {
-               __u32 type;
-               const char *name;
-       } types[] = {
-               { MEDIA_PAD_TYPE_INPUT, "Input" },
-               { MEDIA_PAD_TYPE_OUTPUT, "Output" },
-       };
-
-       unsigned int i;
-
-       for (i = 0; i < ARRAY_SIZE(types); i++) {
-               if (types[i].type == type)
-                       return types[i].name;
-       }
-
-       return "Unknown";
-}
-
 /*
  * media_entity_remote_pad -
  */
-struct media_entity_pad *media_entity_remote_pad(struct media_entity_pad *pad)
+struct media_entity_pad *media_entity_remote_source(struct media_entity_pad *pad)
 {
        unsigned int i;
 
+       if (!(pad->flags & MEDIA_PAD_FLAG_INPUT))
+               return NULL;
+
        for (i = 0; i < pad->entity->info.links; ++i) {
                struct media_entity_link *link = &pad->entity->links[i];
 
                if (!(link->flags & MEDIA_LINK_FLAG_ACTIVE))
                        continue;
 
-               if (link->source == pad)
-                       return link->sink;
-
                if (link->sink == pad)
                        return link->source;
        }
@@ -174,7 +102,7 @@ int media_setup_link(struct media_device *media,
                     __u32 flags)
 {
        struct media_entity_link *link;
-       struct media_user_link ulink;
+       struct media_link_desc ulink;
        unsigned int i;
        int ret;
 
@@ -196,12 +124,12 @@ int media_setup_link(struct media_device *media,
        /* source pad */
        ulink.source.entity = source->entity->info.id;
        ulink.source.index = source->index;
-       ulink.source.type = MEDIA_PAD_TYPE_OUTPUT;
+       ulink.source.flags = MEDIA_PAD_FLAG_OUTPUT;
 
        /* sink pad */
        ulink.sink.entity = sink->entity->info.id;
        ulink.sink.index = sink->index;
-       ulink.sink.type = MEDIA_PAD_TYPE_INPUT;
+       ulink.sink.flags = MEDIA_PAD_FLAG_INPUT;
 
        ulink.flags = flags | (link->flags & MEDIA_LINK_FLAG_IMMUTABLE);
 
@@ -240,137 +168,6 @@ int media_reset_links(struct media_device *media)
        return 0;
 }
 
-static void media_print_topology_dot(struct media_device *media)
-{
-       unsigned int i, j;
-
-       printf("digraph board {\n");
-       printf("\trankdir=TB\n");
-
-       for (i = 0; i < media->entities_count; ++i) {
-               struct media_entity *entity = &media->entities[i];
-               unsigned int npads;
-
-               switch (entity->info.type) {
-               case MEDIA_ENTITY_TYPE_NODE:
-                       printf("\tn%08x [label=\"%s\\n%s\", shape=box, style=filled, "
-                              "fillcolor=yellow]\n",
-                              entity->info.id, entity->info.name, entity->devname);
-                       break;
-
-               case MEDIA_ENTITY_TYPE_SUBDEV:
-                       printf("\tn%08x [label=\"{{", entity->info.id);
-
-                       for (j = 0, npads = 0; j < entity->info.pads; ++j) {
-                               if (entity->pads[j].type != MEDIA_PAD_TYPE_INPUT)
-                                       continue;
-
-                               printf("%s<port%u> %u", npads ? " | " : "", j, j);
-                               npads++;
-                       }
-
-                       printf("} | %s | {", entity->info.name);
-
-                       for (j = 0, npads = 0; j < entity->info.pads; ++j) {
-                               if (entity->pads[j].type != MEDIA_PAD_TYPE_OUTPUT)
-                                       continue;
-
-                               printf("%s<port%u> %u", npads ? " | " : "", j, j);
-                               npads++;
-                       }
-
-                       printf("}}\", shape=Mrecord, style=filled, fillcolor=green]\n");
-                       break;
-
-               default:
-                       continue;
-               }
-
-               for (j = 0; j < entity->info.links; j++) {
-                       struct media_entity_link *link = &entity->links[j];
-
-                       if (link->source->entity != entity)
-                               continue;
-
-                       printf("\tn%08x", link->source->entity->info.id);
-                       if (link->source->entity->info.type == MEDIA_ENTITY_TYPE_SUBDEV)
-                               printf(":port%u", link->source->index);
-                       printf(" -> ");
-                       printf("n%08x", link->sink->entity->info.id);
-                       if (link->sink->entity->info.type == MEDIA_ENTITY_TYPE_SUBDEV)
-                               printf(":port%u", link->sink->index);
-
-                       if (link->flags & MEDIA_LINK_FLAG_IMMUTABLE)
-                               printf(" [style=bold]");
-                       else if (!(link->flags & MEDIA_LINK_FLAG_ACTIVE))
-                               printf(" [style=dashed]");
-                       printf("\n");
-               }
-       }
-
-       printf("}\n");
-}
-
-static void media_print_topology_text(struct media_device *media)
-{
-       unsigned int i, j, k;
-       unsigned int padding;
-
-       printf("Device topology\n");
-
-       for (i = 0; i < media->entities_count; ++i) {
-               struct media_entity *entity = &media->entities[i];
-
-               padding = printf("- entity %u: ", entity->info.id);
-               printf("%s (%u pad%s, %u link%s)\n", entity->info.name,
-                       entity->info.pads, entity->info.pads > 1 ? "s" : "",
-                       entity->info.links, entity->info.links > 1 ? "s" : "");
-               printf("%*ctype %s subtype %s\n", padding, ' ',
-                       media_entity_type_to_string(entity->info.type),
-                       media_entity_subtype_to_string(entity->info.type, entity->info.subtype));
-               if (entity->devname[0])
-                       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];
-
-                       printf("\tpad%u: %s ", j, media_pad_type_to_string(pad->type));
-
-                       if (entity->info.type == MEDIA_ENTITY_TYPE_SUBDEV)
-                               v4l2_subdev_print_format(entity, j, V4L2_SUBDEV_FORMAT_ACTIVE);
-
-                       printf("\n");
-
-                       for (k = 0; k < entity->info.links; k++) {
-                               struct media_entity_link *link = &entity->links[k];
-
-                               if (link->source->entity != entity ||
-                                   link->source->index != j)
-                                       continue;
-
-                               printf("\t\t-> '%s':pad%u [",
-                                       link->sink->entity->info.name, link->sink->index);
-
-                               if (link->flags & MEDIA_LINK_FLAG_IMMUTABLE)
-                                       printf("IMMUTABLE,");
-                               if (link->flags & MEDIA_LINK_FLAG_ACTIVE)
-                                       printf("ACTIVE");
-
-                               printf("]\n");
-                       }
-               }
-               printf("\n");
-       }
-}
-
-void media_print_topology(struct media_device *media, int dot)
-{
-       if (dot)
-               media_print_topology_dot(media);
-       else
-               media_print_topology_text(media);
-}
-
 static int media_enum_links(struct media_device *media)
 {
        __u32 id;
@@ -378,12 +175,12 @@ static int media_enum_links(struct media_device *media)
 
        for (id = 1; id <= media->entities_count; id++) {
                struct media_entity *entity = &media->entities[id - 1];
-               struct media_user_links links;
+               struct media_links_enum links;
                unsigned int i;
 
                links.entity = entity->info.id;
-               links.pads = malloc(entity->info.pads * sizeof(struct media_user_pad));
-               links.links = malloc(entity->info.links * sizeof(struct media_user_link));
+               links.pads = malloc(entity->info.pads * sizeof(struct media_pad_desc));
+               links.links = malloc(entity->info.links * sizeof(struct media_link_desc));
 
                if (ioctl(media->fd, MEDIA_IOC_ENUM_LINKS, &links) < 0) {
                        printf("%s: Unable to enumerate pads and links (%s).\n",
@@ -395,12 +192,12 @@ static int media_enum_links(struct media_device *media)
 
                for (i = 0; i < entity->info.pads; ++i) {
                        entity->pads[i].entity = entity;
-                       entity->pads[i].type = links.pads[i].type;
                        entity->pads[i].index = links.pads[i].index;
+                       entity->pads[i].flags = links.pads[i].flags;
                }
 
                for (i = 0; i < entity->info.links; ++i) {
-                       struct media_user_link *link = &links.links[i];
+                       struct media_link_desc *link = &links.links[i];
                        struct media_entity *source;
                        struct media_entity *sink;
 
@@ -412,11 +209,11 @@ static int media_enum_links(struct media_device *media)
                                        id, i, link->source.entity, link->source.index,
                                        link->sink.entity, link->sink.index);
                                ret = -EINVAL;
+                       } else {
+                               entity->links[i].source = &source->pads[link->source.index];
+                               entity->links[i].sink = &sink->pads[link->sink.index];
+                               entity->links[i].flags = links.links[i].flags;
                        }
-
-                       entity->links[i].source = &source->pads[link->source.index];
-                       entity->links[i].sink = &sink->pads[link->sink.index];
-                       entity->links[i].flags = links.links[i].flags;
                }
 
                free(links.pads);
@@ -462,9 +259,8 @@ static int media_enum_entities(struct media_device *media)
                media->entities_count++;
 
                /* Find the corresponding device name. */
-               if ((entity->info.type != MEDIA_ENTITY_TYPE_NODE ||
-                    entity->info.type != MEDIA_NODE_TYPE_V4L) &&
-                   (entity->info.type != MEDIA_ENTITY_TYPE_SUBDEV))
+               if (media_entity_type(entity) != MEDIA_ENTITY_TYPE_NODE &&
+                   media_entity_type(entity) != MEDIA_ENTITY_TYPE_SUBDEV)
                        continue;
 
                sprintf(sysname, "/sys/dev/char/%u:%u", entity->info.v4l.major,