Make format setting optional for -f option

[media-ctl.git] / main.c

diff --git a/main.c b/main.c
index 15ccfb2..3ca1600 100644 (file)
--- a/main.c
+++ b/main.c
@@ -81,7 +81,8 @@ static struct media_entity_pad *parse_pad(struct media_device *media, const char
                return NULL;
 
        for (p = end; isspace(*p); ++p);
-       *endp = (char *)p;
+       if (endp)
+               *endp = (char *)p;
 
        return &entity->pads[pad];
 }
@@ -208,7 +209,8 @@ static int parse_crop(struct v4l2_rect *crop, const char *p, char **endp)
 {
        char *end;
 
-       for (; isspace(*p); ++p);
+       if (*p++ != '(')
+               return -EINVAL;
 
        crop->left = strtoul(p, &end, 10);
        if (*end != ',')
@@ -216,6 +218,8 @@ static int parse_crop(struct v4l2_rect *crop, const char *p, char **endp)
 
        p = end + 1;
        crop->top = strtoul(p, &end, 10);
+       if (*end++ != ')')
+               return -EINVAL;
        if (*end != '/')
                return -EINVAL;
 
@@ -268,12 +272,15 @@ static struct media_entity_pad *parse_pad_format(struct media_device *media,
        if (*p++ != '[')
                return NULL;
 
-       ret = parse_format(format, p, &end);
-       if (ret < 0)
-               return NULL;
+       if (isalnum(*p)) {
+               ret = parse_format(format, p, &end);
+               if (ret < 0)
+                       return NULL;
 
-       for (p = end; isspace(*p); p++);
-       if (isdigit(*p)) {
+               for (p = end; isspace(*p); p++);
+       }
+
+       if (*p == '(') {
                ret = parse_crop(crop, p, &end);
                if (ret < 0)
                        return NULL;
@@ -300,6 +307,9 @@ static int set_format(struct media_entity_pad *pad, struct v4l2_mbus_framefmt *f
 {
        int ret;
 
+       if (format->width == 0 || format->height == 0)
+               return 0;
+
        printf("Setting up format %s %ux%u on pad %s/%u\n",
                pixelcode_to_string(format->code), format->width, format->height,
                pad->entity->info.name, pad->index);
@@ -345,6 +355,9 @@ static int set_frame_interval(struct media_entity *entity, struct v4l2_fract *in
 {
        int ret;
 
+       if (interval->numerator == 0)
+               return 0;
+
        printf("Setting up frame interval %u/%u on entity %s\n",
                interval->numerator, interval->denominator, entity->info.name);
 
@@ -363,7 +376,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;
+       struct v4l2_mbus_framefmt format = { 0, 0, 0 };
        struct media_entity_pad *pad;
        struct v4l2_rect crop = { -1, -1, -1, -1 };
        struct v4l2_fract interval = { 0, 0 };
@@ -393,13 +406,10 @@ static int setup_format(struct media_device *media, const char *p, char **endp)
                        return ret;
        }
 
-       if (interval.numerator != 0) {
-               ret = set_frame_interval(pad->entity, &interval);
-               if (ret < 0) {
-                       printf("Unable to set frame interval\n");
-                       return ret;
-               }
-       }
+       ret = set_frame_interval(pad->entity, &interval);
+       if (ret < 0)
+               return ret;
+
 
        /* If the pad is an output pad, automatically set the same format on
         * the remote subdev input pads, if any.
@@ -443,6 +453,7 @@ static int setup_formats(struct media_device *media, const char *p)
 int main(int argc, char **argv)
 {
        struct media_device *media;
+       int ret = -1;
 
        if (parse_cmdline(argc, argv))
                return EXIT_FAILURE;
@@ -457,10 +468,26 @@ int main(int argc, char **argv)
 
                entity = media_get_entity_by_name(media, media_opts.entity,
                                                  strlen(media_opts.entity));
-               if (entity != NULL)
-                       printf("%s\n", entity->devname);
-               else
+               if (entity == NULL) {
                        printf("Entity '%s' not found\n", media_opts.entity);
+                       goto out;
+               }
+
+               printf("%s\n", entity->devname);
+       }
+
+       if (media_opts.pad) {
+               struct media_entity_pad *pad;
+
+               pad = parse_pad(media, media_opts.pad, NULL);
+               if (pad == NULL) {
+                       printf("Pad '%s' not found\n", media_opts.pad);
+                       goto out;
+               }
+
+               v4l2_subdev_print_format(pad->entity, pad->index,
+                                        V4L2_SUBDEV_FORMAT_ACTIVE);
+               printf("\n");
        }
 
        if (media_opts.print || media_opts.print_dot) {
@@ -495,10 +522,12 @@ int main(int argc, char **argv)
                }
        }
 
+       ret = 0;
+
 out:
        if (media)
                media_close(media);
 
-       exit(EXIT_SUCCESS);
+       return ret ? EXIT_FAILURE : EXIT_SUCCESS;
 }