am7xxx: change am7xx_device definition, better buffer handling

[libam7xxx.git] / src / picoproj.c

diff --git a/src/picoproj.c b/src/picoproj.c
index 3667e5f..cc31714 100644 (file)
--- a/src/picoproj.c
+++ b/src/picoproj.c
@@ -48,13 +48,18 @@ int main(int argc, char *argv[])
        int opt;
 
        char filename[FILENAME_MAX] = {0};
-       int image_fd = -1;
-       am7xxx_device dev;
+       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;
+       unsigned char *image;
+       unsigned int size;
+       unsigned int native_width;
+       unsigned int native_height;
+       unsigned int unknown0;
+       unsigned int unknown1;
 
        while ((opt = getopt(argc, argv, "f:F:W:H:h")) != -1) {
                switch (opt) {
@@ -67,7 +72,7 @@ int main(int argc, char *argv[])
                        case AM7XXX_IMAGE_FORMAT_JPEG:
                                fprintf(stdout, "JPEG format\n");
                                break;
-                       case AM7XXX_IMAGE_FORMAT_YUV_NV12:
+                       case AM7XXX_IMAGE_FORMAT_NV12:
                                fprintf(stdout, "NV12 format\n");
                                break;
                        default:
@@ -89,34 +94,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();
@@ -126,6 +137,23 @@ int main(int argc, char *argv[])
                goto out_munmap;
        }
 
+       ret = am7xxx_get_device_info(dev, &native_width, &native_height, &unknown0, &unknown1);
+       if (ret < 0) {
+               perror("am7xxx_get_info");
+               exit_code = EXIT_FAILURE;
+               goto cleanup;
+       }
+       printf("Native resolution: %dx%d\n", native_width, native_height);
+       printf("Unknown0: %d\n", unknown0);
+       printf("Unknown1: %d\n", unknown1);
+
+       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");
@@ -139,18 +167,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);