picoproj: move it to an example/ directory

We plan on adding some more useful examples in the future, so it is
better to have them all in their separate directory in order to make the
project structure easier to understand.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7db3067..aba2d43 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,4 +80,5 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
 
 # Add library project
 add_subdirectory(src)
+add_subdirectory(examples)
 add_subdirectory(doc)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0450e26
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_definitions("-D_POSIX_C_SOURCE=2") # for getopt()
+
+include_directories(${CMAKE_SOURCE_DIR}/src/)
+
+# Build a test app that sends a single picture
+add_executable(picoproj picoproj.c)
+target_link_libraries(picoproj am7xxx)
+install(TARGETS picoproj
+  DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")

diff --git a/examples/picoproj.c b/examples/picoproj.c
new file mode 100644 (file)
index 0000000..c3b199c
--- /dev/null
+++ b/examples/picoproj.c
@@ -0,0 +1,211 @@
+/* picoproj - test program for libam7xxx
+ *
+ * Copyright (C) 2012  Antonio Ospite <ospite@studenti.unina.it>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#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 "am7xxx.h"
+
+static void usage(char *name)
+{
+       printf("usage: %s [OPTIONS]\n\n", name);
+       printf("OPTIONS:\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 - YUV - NV12\n");
+       printf("\t-l <log level>\t\tthe verbosity level of libam7xxx output (0-5)\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");
+}
+
+int main(int argc, char *argv[])
+{
+       int ret;
+       int exit_code = EXIT_SUCCESS;
+       int opt;
+
+       char filename[FILENAME_MAX] = {0};
+       int image_fd;
+       struct stat st;
+       am7xxx_context *ctx;
+       am7xxx_device *dev;
+       int log_level = AM7XXX_LOG_INFO;
+       int format = AM7XXX_IMAGE_FORMAT_JPEG;
+       int width = 800;
+       int height = 480;
+       unsigned char *image;
+       unsigned int size;
+       am7xxx_device_info device_info;
+
+       while ((opt = getopt(argc, argv, "f:F:l:W:H:h")) != -1) {
+               switch (opt) {
+               case 'f':
+                       strncpy(filename, optarg, FILENAME_MAX);
+                       break;
+               case 'F':
+                       format = atoi(optarg);
+                       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);
+                       }
+                       break;
+               case 'l':
+                       log_level = atoi(optarg);
+                       if (log_level < AM7XXX_LOG_FATAL || log_level > AM7XXX_LOG_TRACE) {
+                               fprintf(stderr, "Unsupported log level, falling back to AM7XXX_LOG_ERROR\n");
+                               log_level = AM7XXX_LOG_ERROR;
+                       }
+                       break;
+               case 'W':
+                       width = atoi(optarg);
+                       if (width < 0) {
+                               fprintf(stderr, "Unsupported width\n");
+                               exit(EXIT_FAILURE);
+                       }
+                       break;
+               case 'H':
+                       height = atoi(optarg);
+                       if (height < 0) {
+                               fprintf(stderr, "Unsupported height\n");
+                               exit(EXIT_FAILURE);
+                       }
+                       break;
+               case 'h':
+                       usage(argv[0]);
+                       exit(EXIT_SUCCESS);
+                       break;
+               default: /* '?' */
+                       usage(argv[0]);
+                       exit(EXIT_FAILURE);
+               }
+       }
+
+       if (filename[0] == '\0') {
+               fprintf(stderr, "An image file MUST be specified.\n");
+               exit_code = EXIT_FAILURE;
+               goto out;
+       }
+
+       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 = am7xxx_init(&ctx);
+       if (ret < 0) {
+               perror("am7xxx_init");
+               exit_code = EXIT_FAILURE;
+               goto out_munmap;
+       }
+
+       am7xxx_set_log_level(ctx, log_level);
+
+       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);
+       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;
+               goto cleanup;
+       }
+       printf("Native resolution: %dx%d\n",
+              device_info.native_width, device_info.native_height);
+
+       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");
+               exit_code = EXIT_FAILURE;
+               goto cleanup;
+       }
+
+       exit_code = EXIT_SUCCESS;
+
+cleanup:
+       am7xxx_shutdown(ctx);
+
+out_munmap:
+       ret = munmap(image, size);
+       if (ret < 0)
+               perror("munmap");
+
+out_close_image_fd:
+       ret = close(image_fd);
+       if (ret < 0)
+               perror("close");
+
+out:
+       exit(exit_code);
+}

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 217b0f1..bec1d5c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_definitions("-D_BSD_SOURCE") # for htole32()
-add_definitions("-D_POSIX_C_SOURCE=2") # for getopt()
 
 # Find packages needed to build library
 find_package(libusb-1.0 REQUIRED)
@@ -36,9 +35,3 @@ if(UNIX AND NOT APPLE)
   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libam7xxx.pc"
     DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
 endif()
-
-# Build the test app
-add_executable(picoproj picoproj.c)
-target_link_libraries(picoproj am7xxx)
-install(TARGETS picoproj
-  DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")

diff --git a/src/picoproj.c b/src/picoproj.c
deleted file mode 100644 (file)
index c3b199c..0000000
--- a/src/picoproj.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/* picoproj - test program for libam7xxx
- *
- * Copyright (C) 2012  Antonio Ospite <ospite@studenti.unina.it>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#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 "am7xxx.h"
-
-static void usage(char *name)
-{
-       printf("usage: %s [OPTIONS]\n\n", name);
-       printf("OPTIONS:\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 - YUV - NV12\n");
-       printf("\t-l <log level>\t\tthe verbosity level of libam7xxx output (0-5)\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");
-}
-
-int main(int argc, char *argv[])
-{
-       int ret;
-       int exit_code = EXIT_SUCCESS;
-       int opt;
-
-       char filename[FILENAME_MAX] = {0};
-       int image_fd;
-       struct stat st;
-       am7xxx_context *ctx;
-       am7xxx_device *dev;
-       int log_level = AM7XXX_LOG_INFO;
-       int format = AM7XXX_IMAGE_FORMAT_JPEG;
-       int width = 800;
-       int height = 480;
-       unsigned char *image;
-       unsigned int size;
-       am7xxx_device_info device_info;
-
-       while ((opt = getopt(argc, argv, "f:F:l:W:H:h")) != -1) {
-               switch (opt) {
-               case 'f':
-                       strncpy(filename, optarg, FILENAME_MAX);
-                       break;
-               case 'F':
-                       format = atoi(optarg);
-                       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);
-                       }
-                       break;
-               case 'l':
-                       log_level = atoi(optarg);
-                       if (log_level < AM7XXX_LOG_FATAL || log_level > AM7XXX_LOG_TRACE) {
-                               fprintf(stderr, "Unsupported log level, falling back to AM7XXX_LOG_ERROR\n");
-                               log_level = AM7XXX_LOG_ERROR;
-                       }
-                       break;
-               case 'W':
-                       width = atoi(optarg);
-                       if (width < 0) {
-                               fprintf(stderr, "Unsupported width\n");
-                               exit(EXIT_FAILURE);
-                       }
-                       break;
-               case 'H':
-                       height = atoi(optarg);
-                       if (height < 0) {
-                               fprintf(stderr, "Unsupported height\n");
-                               exit(EXIT_FAILURE);
-                       }
-                       break;
-               case 'h':
-                       usage(argv[0]);
-                       exit(EXIT_SUCCESS);
-                       break;
-               default: /* '?' */
-                       usage(argv[0]);
-                       exit(EXIT_FAILURE);
-               }
-       }
-
-       if (filename[0] == '\0') {
-               fprintf(stderr, "An image file MUST be specified.\n");
-               exit_code = EXIT_FAILURE;
-               goto out;
-       }
-
-       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 = am7xxx_init(&ctx);
-       if (ret < 0) {
-               perror("am7xxx_init");
-               exit_code = EXIT_FAILURE;
-               goto out_munmap;
-       }
-
-       am7xxx_set_log_level(ctx, log_level);
-
-       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);
-       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;
-               goto cleanup;
-       }
-       printf("Native resolution: %dx%d\n",
-              device_info.native_width, device_info.native_height);
-
-       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");
-               exit_code = EXIT_FAILURE;
-               goto cleanup;
-       }
-
-       exit_code = EXIT_SUCCESS;
-
-cleanup:
-       am7xxx_shutdown(ctx);
-
-out_munmap:
-       ret = munmap(image, size);
-       if (ret < 0)
-               perror("munmap");
-
-out_close_image_fd:
-       ret = close(image_fd);
-       if (ret < 0)
-               perror("close");
-
-out:
-       exit(exit_code);
-}