X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/a90e2ac0541712553638996d2247046fe5b35001..759559da7fb9c03e5f42eab12acbc01ebe763186:/examples/picoproj.c?ds=sidebyside

diff --git a/examples/picoproj.c b/examples/picoproj.c
index 2c1b257..9128538 100644
--- a/examples/picoproj.c
+++ b/examples/picoproj.c
@@ -24,11 +24,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "am7xxx.h"
 
@@ -36,14 +36,19 @@ static void usage(char *name)
 {
 	printf("usage: %s [OPTIONS]\n\n", name);
 	printf("OPTIONS:\n");
+	printf("\t-d <index>\t\tthe device index (default is 0)\n");
 	printf("\t-f <filename>\t\tthe image file to upload\n");
 	printf("\t-F <format>\t\tthe image format to use (default is JPEG)\n");
 	printf("\t\t\t\tSUPPORTED FORMATS:\n");
 	printf("\t\t\t\t\t1 - JPEG\n");
 	printf("\t\t\t\t\t2 - NV12\n");
 	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-p <power mode>\t\tthe power mode of device, between %d (off) and %d (turbo)\n",
+	       AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+	printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n");
+	printf("\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");
@@ -54,26 +59,37 @@ static void usage(char *name)
 int main(int argc, char *argv[])
 {
 	int ret;
-	int exit_code = EXIT_SUCCESS;
 	int opt;
 
 	char filename[FILENAME_MAX] = {0};
-	int image_fd;
+	FILE *image_fp;
 	struct stat st;
 	am7xxx_context *ctx;
 	am7xxx_device *dev;
 	int log_level = AM7XXX_LOG_INFO;
-	am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
+	int device_index = 0;
+	int power_mode = AM7XXX_POWER_LOW;
+	int zoom = AM7XXX_ZOOM_ORIGINAL;
 	int format = AM7XXX_IMAGE_FORMAT_JPEG;
 	int width = 800;
 	int height = 480;
 	unsigned char *image;
-	unsigned int size;
+	off_t size;
 	am7xxx_device_info device_info;
 
-	while ((opt = getopt(argc, argv, "f:F:l:p:W:H:h")) != -1) {
+	while ((opt = getopt(argc, argv, "d:f:F:l:p:z:W:H:h")) != -1) {
 		switch (opt) {
+		case 'd':
+			device_index = atoi(optarg);
+			if (device_index < 0) {
+				fprintf(stderr, "Unsupported device index\n");
+				ret = -EINVAL;
+				goto out;
+			}
+			break;
 		case 'f':
+			if (filename[0] != '\0')
+				fprintf(stderr, "Warning: image file already specified\n");
 			strncpy(filename, optarg, FILENAME_MAX);
 			break;
 		case 'F':
@@ -87,7 +103,8 @@ int main(int argc, char *argv[])
 				break;
 			default:
 				fprintf(stderr, "Unsupported format\n");
-				exit(EXIT_FAILURE);
+				ret = -EINVAL;
+				goto out;
 			}
 			break;
 		case 'l':
@@ -105,68 +122,103 @@ int main(int argc, char *argv[])
 			case AM7XXX_POWER_MIDDLE:
 			case AM7XXX_POWER_HIGH:
 			case AM7XXX_POWER_TURBO:
-				fprintf(stdout, "Power mode: %x\n", power_mode);
+				fprintf(stdout, "Power mode: %d\n", power_mode);
+				break;
+			default:
+				fprintf(stderr, "Invalid power mode value, must be between %d and %d\n",
+					AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+				ret = -EINVAL;
+				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 power mode value, must be between %x and %x\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
-				exit(EXIT_FAILURE);
+				fprintf(stderr, "Invalid zoom mode value, must be between %d and %d\n",
+					AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
+				ret = -EINVAL;
+				goto out;
 			}
 			break;
 		case 'W':
 			width = atoi(optarg);
 			if (width < 0) {
 				fprintf(stderr, "Unsupported width\n");
-				exit(EXIT_FAILURE);
+				ret = -EINVAL;
+				goto out;
 			}
 			break;
 		case 'H':
 			height = atoi(optarg);
 			if (height < 0) {
 				fprintf(stderr, "Unsupported height\n");
-				exit(EXIT_FAILURE);
+				ret = -EINVAL;
+				goto out;
 			}
 			break;
 		case 'h':
 			usage(argv[0]);
-			exit(EXIT_SUCCESS);
-			break;
+			ret = 0;
+			goto out;
 		default: /* '?' */
 			usage(argv[0]);
-			exit(EXIT_FAILURE);
+			ret = -EINVAL;
+			goto out;
 		}
 	}
 
 	if (filename[0] == '\0') {
-		fprintf(stderr, "An image file MUST be specified.\n");
-		exit_code = EXIT_FAILURE;
+		fprintf(stderr, "An image file MUST be specified with the -f option.\n\n");
+		usage(argv[0]);
+		ret = -EINVAL;
 		goto out;
 	}
 
-	image_fd = open(filename, O_RDONLY);
-	if (image_fd < 0) {
-		perror("open");
-		exit_code = EXIT_FAILURE;
+	image_fp = fopen(filename, "rb");
+	if (image_fp == NULL) {
+		perror("fopen");
+		ret = -EINVAL;
 		goto out;
 	}
-	if (fstat(image_fd, &st) < 0) {
+	ret = fstat(fileno(image_fp), &st);
+	if (ret < 0) {
 		perror("fstat");
-		exit_code = EXIT_FAILURE;
-		goto out_close_image_fd;
+		goto out_close_image_fp;
 	}
 	size = st.st_size;
 
-	image = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, image_fd, 0);
+	image = malloc(size * sizeof(unsigned char));
 	if (image == NULL) {
-		perror("mmap");
-		exit_code = EXIT_FAILURE;
-		goto out_close_image_fd;
+		perror("malloc");
+		ret = -ENOMEM;
+		goto out_close_image_fp;
+	}
+
+	ret = (int)fread(image, size, 1, image_fp);
+	if (ret != 1) {
+		if (feof(image_fp))
+			fprintf(stderr, "Unexpected end of file.\n");
+		else if (ferror(image_fp))
+			perror("fread");
+		else
+			fprintf(stderr, "Unexpected error condition.\n");
+
+		if (ret >= 0)
+			ret = -EINVAL;
+		goto out_free_image;
 	}
 
 	ret = am7xxx_init(&ctx);
 	if (ret < 0) {
 		perror("am7xxx_init");
-		exit_code = EXIT_FAILURE;
-		goto out_munmap;
+		goto out_free_image;
 	}
 
 	am7xxx_set_log_level(ctx, log_level);
@@ -174,67 +226,71 @@ int main(int argc, char *argv[])
 	ret = am7xxx_open_device(ctx, &dev, 0);
 	if (ret < 0) {
 		perror("am7xxx_open_device");
-		exit_code = EXIT_FAILURE;
 		goto cleanup;
 	}
 
-
 	ret = am7xxx_close_device(dev);
 	if (ret < 0) {
 		perror("am7xxx_close_device");
-		exit_code = EXIT_FAILURE;
 		goto cleanup;
 	}
 
-	ret = am7xxx_open_device(ctx, &dev, 0);
+	ret = am7xxx_open_device(ctx, &dev, device_index);
 	if (ret < 0) {
 		perror("am7xxx_open_device");
-		exit_code = EXIT_FAILURE;
 		goto cleanup;
 	}
 
 	ret = am7xxx_get_device_info(dev, &device_info);
 	if (ret < 0) {
-		perror("am7xxx_get_info");
-		exit_code = EXIT_FAILURE;
+		perror("am7xxx_get_device_info");
 		goto cleanup;
 	}
 	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");
+		goto cleanup;
+	}
+
 	ret = am7xxx_set_power_mode(dev, power_mode);
 	if (ret < 0) {
 		perror("am7xxx_set_power_mode");
-		exit_code = EXIT_FAILURE;
+		goto cleanup;
+	}
+
+	/* When setting AM7XXX_ZOOM_TEST don't display the actual image */
+	if (zoom == AM7XXX_ZOOM_TEST) {
+		printf("AM7XXX_ZOOM_TEST requested, not sending actual image.\n");
 		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");
+		fprintf(stderr,
+			"WARNING: image is %dx%d, not fitting the native resolution, it may be displayed wrongly!\n",
+			width, height);
 
-	ret = am7xxx_send_image(dev, format, width, height, image, size);
+	ret = am7xxx_send_image(dev, format, width, height, image, (unsigned int)size);
 	if (ret < 0) {
 		perror("am7xxx_send_image");
-		exit_code = EXIT_FAILURE;
 		goto cleanup;
 	}
 
-	exit_code = EXIT_SUCCESS;
+	ret = 0;
 
 cleanup:
 	am7xxx_shutdown(ctx);
 
-out_munmap:
-	ret = munmap(image, size);
-	if (ret < 0)
-		perror("munmap");
+out_free_image:
+	free(image);
 
-out_close_image_fd:
-	ret = close(image_fd);
-	if (ret < 0)
-		perror("close");
+out_close_image_fp:
+	if (fclose(image_fp) == EOF)
+		perror("fclose");
 
 out:
-	exit(exit_code);
+	return ret;
 }