From: Antonio Ospite Date: Thu, 21 Jun 2012 08:32:32 +0000 (+0200) Subject: am7xxx-play: support setting the zoom mode X-Git-Tag: v0.1.3~16^2~4 X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/b3cc25c31d6bfc95aa1bd8a63c85f0b5cab60d11?ds=inline am7xxx-play: support setting the zoom mode --- diff --git a/doc/man/am7xxx-play.1.txt b/doc/man/am7xxx-play.1.txt index 5054da4..193835f 100644 --- a/doc/man/am7xxx-play.1.txt +++ b/doc/man/am7xxx-play.1.txt @@ -58,6 +58,9 @@ EXAMPLE: WARNING: Level 2 and greater require the master AND the slave connector to be plugged in. +*-z* '':: + the display zoom mode, between 0 (original) and 3 (test) + *-h*:: this help message diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c index 324ed89..af15949 100644 --- a/examples/am7xxx-play.c +++ b/examples/am7xxx-play.c @@ -596,6 +596,8 @@ static void usage(char *name) printf("\t-l \t\tthe verbosity level of libam7xxx output (0-5)\n"); printf("\t-p \tpower level of device, between %x (off) and %x (maximum)\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO); printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n\t\t\t\t\t the slave connector to be plugged in.\n"); + printf("\t-z \t\tthe display zoom mode, between %d (original) and %d (test)\n", + AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST); printf("\t-h \t\t\tthis help message\n"); printf("\n\nEXAMPLES OF USE:\n"); printf("\t%s -f x11grab -i :0.0 -o video_size=800x480\n", name); @@ -619,11 +621,12 @@ int main(int argc, char *argv[]) unsigned int quality = 95; int log_level = AM7XXX_LOG_INFO; am7xxx_power_mode power_mode = AM7XXX_POWER_LOW; + am7xxx_zoom_mode zoom = AM7XXX_ZOOM_ORIGINAL; int format = AM7XXX_IMAGE_FORMAT_JPEG; am7xxx_context *ctx; am7xxx_device *dev; - while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:p:h")) != -1) { + while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:p:z:h")) != -1) { switch (opt) { case 'f': input_format_string = strdup(optarg); @@ -723,6 +726,21 @@ int main(int argc, char *argv[]) goto out; } break; + case 'z': + zoom = atoi(optarg); + switch(zoom) { + case AM7XXX_ZOOM_ORIGINAL: + case AM7XXX_ZOOM_H: + case AM7XXX_ZOOM_H_V: + case AM7XXX_ZOOM_TEST: + fprintf(stdout, "Zoom: %d\n", zoom); + break; + default: + fprintf(stderr, "Invalid zoom mode value, must be between %d and %d\n", + AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST); + exit(EXIT_FAILURE); + } + break; case 'h': usage(argv[0]); ret = 0; @@ -782,12 +800,22 @@ int main(int argc, char *argv[]) goto cleanup; } + ret = am7xxx_set_zoom_mode(dev, zoom); + if (ret < 0) { + perror("am7xxx_set_zoom_mode"); + goto cleanup; + } + ret = am7xxx_set_power_mode(dev, power_mode); if (ret < 0) { perror("am7xxx_set_power_mode"); goto cleanup; } + /* When setting AM7XXX_ZOOM_TEST don't display the actual image */ + if (zoom == AM7XXX_ZOOM_TEST) + goto cleanup; + ret = am7xxx_play(input_format_string, &options, input_path,