Add support for sending an actual JPEG image

[libam7xxx.git] / picoproj.c

diff --git a/picoproj.c b/picoproj.c
index 197d5da..161be49 100644 (file)
--- a/picoproj.c
+++ b/picoproj.c
@@ -22,6 +22,10 @@
 #include <string.h>
 #include <endian.h>
 #include <errno.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <unistd.h>
 
 typedef enum {
@@ -130,6 +134,11 @@ static void dump_header(struct header *h)
        fflush(stdout);
 }
 
+static inline unsigned int in_80chars(unsigned int i)
+{
+       return ((i+1) % (80/3));
+}
+
 static void dump_buffer(uint8_t *buffer, unsigned int len)
 {
        unsigned int i;
@@ -138,7 +147,7 @@ static void dump_buffer(uint8_t *buffer, unsigned int len)
                return;
 
        for (i = 0; i < len; i++) {
-               printf("%02hhX%c", buffer[i], (i < len - 1) ? ' ' : '\n');
+               printf("%02hhX%c", buffer[i], (in_80chars(i) && (i < len - 1)) ? ' ' : '\n');
        }
        fflush(stdout);
 }
@@ -216,14 +225,16 @@ 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 = -1;
        int format = AM7x01_IMAGE_FORMAT_JPEG;
        int width = 800;
        int height = 480;
        uint8_t *image = NULL;
-       int size = 59475;
+       unsigned int size = 59475;
 
        while ((opt = getopt(argc, argv, "f:F:W:H:h")) != -1) {
                switch (opt) {
@@ -257,11 +268,53 @@ int main(int argc, char *argv[])
                }
        }
 
+       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;
+
+               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;
+               }
+       }
+
        ret = send_image(format, width, height, image, size);
        if (ret < 0) {
                perror("send_image");
-               exit(EXIT_FAILURE);
+               exit_code = EXIT_FAILURE;
+               goto cleanup;
+       }
+
+       exit_code = EXIT_SUCCESS;
+
+cleanup:
+       if (image != NULL) {
+               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");
        }
 
-       exit(EXIT_SUCCESS);
+out:
+       exit(exit_code);
 }