X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/b9a31ad87f63016dc9f914f61ab06606a948aa90..0a0245dfbfc15f619ab1cc23d1f7ff76ecc2fcd6:/src/picoproj.c?ds=sidebyside

diff --git a/src/picoproj.c b/src/picoproj.c
index c3f8b10..1aa6b04 100644
--- a/src/picoproj.c
+++ b/src/picoproj.c
@@ -35,6 +35,7 @@ static void usage(char *name)
 	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 - YUV - NV12\n");
 	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");
@@ -47,13 +48,14 @@ int main(int argc, char *argv[])
 	int opt;
 
 	char filename[FILENAME_MAX] = {0};
-	int image_fd = -1;
+	int image_fd;
+	struct stat st;
 	am7xxx_device dev;
 	int format = AM7XXX_IMAGE_FORMAT_JPEG;
 	int width = 800;
 	int height = 480;
-	uint8_t *image = NULL;
-	unsigned int size = 59475;
+	uint8_t *image;
+	unsigned int size;
 
 	while ((opt = getopt(argc, argv, "f:F:W:H:h")) != -1) {
 		switch (opt) {
@@ -62,7 +64,14 @@ int main(int argc, char *argv[])
 			break;
 		case 'F':
 			format = atoi(optarg);
-			if (format != 1) {
+			switch(format) {
+			case AM7XXX_IMAGE_FORMAT_JPEG:
+				fprintf(stdout, "JPEG format\n");
+				break;
+			case AM7XXX_IMAGE_FORMAT_NV12:
+				fprintf(stdout, "NV12 format\n");
+				break;
+			default:
 				fprintf(stderr, "Unsupported format\n");
 				exit(EXIT_FAILURE);
 			}
@@ -81,34 +90,40 @@ int main(int argc, char *argv[])
 				exit(EXIT_FAILURE);
 			}
 			break;
+		case 'h':
+			usage(argv[0]);
+			exit(EXIT_SUCCESS);
+			break;
 		default: /* '?' */
 			usage(argv[0]);
 			exit(EXIT_FAILURE);
 		}
 	}
 
-	if (filename[0] != '\0') {
-		struct stat st;
-		
-		image_fd = open(filename, O_RDONLY);
-		if (image_fd < 0) {
-			perror("open");
-			exit_code = EXIT_FAILURE;
-			goto out;
-		}
-		if (fstat(image_fd, &st) < 0) {
-			perror("fstat");
-			exit_code = EXIT_FAILURE;
-			goto out_close_image_fd;
-		}
-		size = st.st_size;
+	if (filename[0] == '\0') {
+		fprintf(stderr, "An image file MUST be specified.\n");
+		exit_code = EXIT_FAILURE;
+		goto out;
+	}
 
-		image = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, image_fd, 0);
-		if (image == NULL) {
-			perror("mmap");
-			exit_code = EXIT_FAILURE;
-			goto out_close_image_fd;
-		}
+	image_fd = open(filename, O_RDONLY);
+	if (image_fd < 0) {
+		perror("open");
+		exit_code = EXIT_FAILURE;
+		goto out;
+	}
+	if (fstat(image_fd, &st) < 0) {
+		perror("fstat");
+		exit_code = EXIT_FAILURE;
+		goto out_close_image_fd;
+	}
+	size = st.st_size;
+
+	image = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, image_fd, 0);
+	if (image == NULL) {
+		perror("mmap");
+		exit_code = EXIT_FAILURE;
+		goto out_close_image_fd;
 	}
 
 	dev = am7xxx_init();
@@ -118,6 +133,13 @@ int main(int argc, char *argv[])
 		goto out_munmap;
 	}
 
+	ret = am7xxx_set_power_mode(dev, AM7XXX_POWER_LOW);
+	if (ret < 0) {
+		perror("am7xxx_set_power_mode");
+		exit_code = EXIT_FAILURE;
+		goto cleanup;
+	}
+
 	ret = am7xxx_send_image(dev, format, width, height, image, size);
 	if (ret < 0) {
 		perror("am7xxx_send_image");
@@ -131,18 +153,14 @@ cleanup:
 	am7xxx_shutdown(dev);
 
 out_munmap:
-	if (image != NULL) {
-		ret = munmap(image, size);
-		if (ret < 0)
-			perror("munmap");
-	}
+	ret = munmap(image, size);
+	if (ret < 0)
+		perror("munmap");
 
 out_close_image_fd:
-	if (image_fd >= 0) {
-		ret = close(image_fd);
-		if (ret < 0)
-			perror("close");
-	}
+	ret = close(image_fd);
+	if (ret < 0)
+		perror("close");
 
 out:
 	exit(exit_code);