From e67e885d8577f6dea5b77eef5ec83071a958318a Mon Sep 17 00:00:00 2001
From: Antonio Ospite <ospite@studenti.unina.it>
Date: Mon, 20 Feb 2012 13:43:03 +0100
Subject: [PATCH] picoproj: support setting the zoom mode
---
doc/man/picoproj.1.txt | 3 +++
examples/picoproj.c | 32 +++++++++++++++++++++++++++++++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/doc/man/picoproj.1.txt b/doc/man/picoproj.1.txt
index ce56f0e..309402c 100644
--- a/doc/man/picoproj.1.txt
+++ b/doc/man/picoproj.1.txt
@@ -42,6 +42,9 @@ OPTIONS
WARNING: Level 2 and greater require the master AND
the slave connector to be plugged in.
+*-z* '<zoom mode>'::
+ the display zoom mode, between 0 (original) and 3 (test)
+
*-W* '<image width>'::
the width of the image to upload
diff --git a/examples/picoproj.c b/examples/picoproj.c
index 8503612..b643918 100644
--- a/examples/picoproj.c
+++ b/examples/picoproj.c
@@ -43,6 +43,8 @@ static void usage(char *name)
printf("\t-l <log level>\t\tthe verbosity level of libam7xxx output (0-5)\n");
printf("\t-p <power level>\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 <zoom mode>\t\tthe display zoom mode, between %d (original) and %d (test)\n",
+ AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
printf("\t-W <image width>\tthe width of the image to upload\n");
printf("\t-H <image height>\tthe height of the image to upload\n");
printf("\t-h \t\t\tthis help message\n");
@@ -63,6 +65,7 @@ int main(int argc, char *argv[])
am7xxx_device *dev;
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;
int width = 800;
int height = 480;
@@ -70,7 +73,7 @@ int main(int argc, char *argv[])
unsigned int size;
am7xxx_device_info device_info;
- while ((opt = getopt(argc, argv, "f:F:l:p:W:H:h")) != -1) {
+ while ((opt = getopt(argc, argv, "f:F:l:p:z:W:H:h")) != -1) {
switch (opt) {
case 'f':
if (filename[0] != '\0')
@@ -113,6 +116,21 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
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 'W':
width = atoi(optarg);
if (width < 0) {
@@ -215,6 +233,13 @@ int main(int argc, char *argv[])
printf("Native resolution: %dx%d\n",
device_info.native_width, device_info.native_height);
+ ret = am7xxx_set_zoom_mode(dev, zoom);
+ if (ret < 0) {
+ perror("am7xxx_set_zoom_mode");
+ exit_code = EXIT_FAILURE;
+ goto cleanup;
+ }
+
ret = am7xxx_set_power_mode(dev, power_mode);
if (ret < 0) {
perror("am7xxx_set_power_mode");
@@ -222,6 +247,11 @@ int main(int argc, char *argv[])
goto cleanup;
}
+ /* When setting AM7XXX_ZOOM_TEST don't display the actual image */
+ if (zoom == AM7XXX_ZOOM_TEST)
+ goto cleanup;
+
+
if ((unsigned int)width > device_info.native_width ||
(unsigned int)height > device_info.native_height)
fprintf(stderr, "WARNING: image not fitting the native resolution, it may be displayed wrongly!\n");
--
2.1.4