Change crop rectangle format from L,T/WxH to (L,T)/WxH

[media-ctl.git] / options.c

diff --git a/options.c b/options.c
index 69ff9d5..4f8df71 100644 (file)
--- a/options.c
+++ b/options.c
@@ -35,7 +35,8 @@ static void usage(const char *argv0, int verbose)
        printf("%s [options] device\n", argv0);
        printf("-d, --device dev        Media device name (default: %s)\n", MEDIA_DEVNAME_DEFAULT);
        printf("-e, --entity name       Print the device name associated with the given entity\n");
-       printf("-f, --formats           Comma-separated list of formats to setup\n");
+       printf("-f, --set-format        Comma-separated list of formats to setup\n");
+       printf("    --get-format pad    Print the active format on a given pad\n");
        printf("-h, --help              Show verbose help and exit\n");
        printf("-i, --interactive       Modify links interactively\n");
        printf("-l, --links             Comma-separated list of links descriptors to setup\n");
@@ -50,11 +51,12 @@ static void usage(const char *argv0, int verbose)
        printf("\n");
        printf("Links and formats are defined as\n");
        printf("\tlink            = pad, '->', pad, '[', flags, ']' ;\n");
-       printf("\tformat          = pad, '[', fcc, ' ', size, [ ' ', crop ], ']' ;\n");
+       printf("\tformat          = pad, '[', fcc, ' ', size, [ ' ', crop ], [ ' ', '@', frame interval ], ']' ;\n");
        printf("\tpad             = entity, ':', pad number ;\n");
        printf("\tentity          = entity number | ( '\"', entity name, '\"' ) ;\n");
        printf("\tsize            = width, 'x', height ;\n");
-       printf("\tcrop            = left, ',', top, '/', size ;\n");
+       printf("\tcrop            = '(', left, ',', top, ')', '/', size ;\n");
+       printf("\tframe interval  = numerator, '/', denominator ;\n");
        printf("where the fields are\n");
        printf("\tentity number   Entity numeric identifier\n");
        printf("\tentity name     Entify name (string) \n");
@@ -63,14 +65,18 @@ static void usage(const char *argv0, int verbose)
        printf("\tfcc             Format FourCC\n");
        printf("\twidth           Image width in pixels\n");
        printf("\theight          Image height in pixels\n");
+       printf("\tnumerator       Frame interval numerator\n");
+       printf("\tdenominator     Frame interval denominator\n");
 }
 
-#define OPT_PRINT_DOT  256
+#define OPT_PRINT_DOT          256
+#define OPT_GET_FORMAT         257
 
 static struct option opts[] = {
        {"device", 1, 0, 'd'},
        {"entity", 1, 0, 'e'},
-       {"formats", 1, 0, 'f'},
+       {"set-format", 1, 0, 'f'},
+       {"get-format", 1, 0, OPT_GET_FORMAT},
        {"help", 0, 0, 'h'},
        {"interactive", 0, 0, 'i'},
        {"links", 1, 0, 'l'},
@@ -133,6 +139,10 @@ int parse_cmdline(int argc, char **argv)
                        media_opts.print_dot = 1;
                        break;
 
+               case OPT_GET_FORMAT:
+                       media_opts.pad = optarg;
+                       break;
+
                default:
                        printf("Invalid option -%c\n", opt);
                        printf("Run %s -h for help.\n", argv[0]);