Move opts/ into util/opts/

cmd/camera-streamer/http.c

@@ -1,7 +1,7 @@
 #include "http/http.h"
-#include "opts/opts.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/opts.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
 #include "rtsp/rtsp.h"
 

cmd/camera-streamer/main.c

@@ -1,7 +1,7 @@
 #include "http/http.h"
-#include "opts/opts.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/opts.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
 #include "rtsp/rtsp.h"
 

cmd/camera-streamer/opts.c

@@ -1,7 +1,7 @@
 #include "http/http.h"
-#include "opts/opts.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/opts.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
 #include "rtsp/rtsp.h"
 

device/buffer.c

@@ -1,7 +1,7 @@
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 buffer_t *buffer_open(const char *name, buffer_list_t *buf_list, int index) {
   buffer_t *buf = calloc(1, sizeof(buffer_t));

device/buffer_list.c

@@ -1,8 +1,8 @@
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 
 buffer_list_t *buffer_list_open(const char *name, int index, struct device_s *dev, const char *path, buffer_format_t fmt, bool do_capture, bool do_mmap)
 {

device/buffer_lock.c

@@ -1,7 +1,7 @@
 #include "device/buffer_lock.h"
 #include "device/buffer_list.h"
 #include "device/buffer.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 bool buffer_lock_is_used(buffer_lock_t *buf_lock)
 {

device/buffer_queue.c

@@ -1,7 +1,7 @@
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 #include <pthread.h>
 #include <inttypes.h>

device/camera/camera.c

@@ -3,8 +3,8 @@
 #include "device/device.h"
 #include "device/buffer_list.h"
 #include "device/links.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 
 camera_t *camera_open(camera_options_t *options)
 {

device/camera/camera_input.c

@@ -4,8 +4,8 @@
 #include "device/buffer_list.h"
 #include "device/device.h"
 #include "device/links.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 
 static int camera_configure_input_v4l2(camera_t *camera)
 {

device/camera/camera_isp.c

@@ -4,8 +4,8 @@
 #include "device/buffer_list.h"
 #include "device/device.h"
 #include "device/links.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 #include "device/buffer_list.h"
 #include "http/http.h"
 

device/camera/camera_output.c

@@ -4,8 +4,8 @@
 #include "device/buffer_list.h"
 #include "device/device.h"
 #include "device/links.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 #include "device/buffer_list.h"
 #include "http/http.h"
 #include "rtsp/rtsp.h"

device/device.c

@@ -1,8 +1,8 @@
 #include "device/device.h"
 #include "device/buffer.h"
 #include "device/buffer_list.h"
-#include "opts/log.h"
-#include "opts/opts.h"
+#include "util/opts/log.h"
+#include "util/opts/opts.h"
 
 device_t *device_open(const char *name, const char *path, device_hw_t *hw) {
   device_t *dev = calloc(1, sizeof(device_t));

device/libcamera/fake_camera.c

@@ -8,7 +8,7 @@
 
 #include <linux/media.h>
 
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 // This is special code to force `libcamera` to think that given sensor is different
 // ex.: fake `arducam_64mp` to be run as `imx519`

device/libcamera/libcamera.hh

@@ -10,9 +10,9 @@ extern "C" {
 #include "device/device.h"
 #include "device/buffer_list.h"
 #include "device/buffer.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
-#include "opts/control.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
+#include "util/opts/control.h"
 };
 
 #ifdef USE_LIBCAMERA

device/links.c

@@ -2,8 +2,8 @@
 #include "device/device.h"
 #include "device/buffer.h"
 #include "device/buffer_list.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 
 #define N_FDS 50
 #define QUEUE_ON_CAPTURE // seems to provide better latency

device/v4l2/buffer.c

@@ -2,7 +2,7 @@
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 int v4l2_buffer_open(buffer_t *buf)
 {

device/v4l2/buffer_list.c

@@ -2,8 +2,8 @@
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
 
 int v4l2_buffer_list_open(buffer_list_t *buf_list)
 {

device/v4l2/debug.c

@@ -1,7 +1,7 @@
 #include "v4l2.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 int v4l2_buffer_list_refresh_states(buffer_list_t *buf_list)
 {

device/v4l2/device.c

@@ -1,6 +1,6 @@
 #include "v4l2.h"
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 int v4l2_device_open(device_t *dev)
 {

device/v4l2/device_media.c

@@ -1,7 +1,7 @@
 #include "v4l2.h"
 
 #include "device/device.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 #include <unistd.h>
 #include <dirent.h>

device/v4l2/device_options.c

@@ -1,7 +1,7 @@
 #include "v4l2.h"
 #include "device/device.h"
-#include "opts/log.h"
-#include "opts/control.h"
+#include "util/opts/log.h"
+#include "util/opts/control.h"
 
 int v4l2_device_set_option_by_id(device_t *dev, const char *name, uint32_t id, int32_t value)
 {

ffmpeg/remuxer.c

@@ -1,5 +1,5 @@
 #include "ffmpeg/remuxer.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 #include <inttypes.h>
 

http/http.c

@@ -12,7 +12,7 @@
 #include <signal.h>
 
 #include "http/http.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 static int http_listen(int port, int maxcons)
 {

http/http_ffmpeg.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "opts/log.h"
+#include "util/opts/log.h"
 #include "http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_lock.h"

http/http_h264.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "opts/log.h"
+#include "util/opts/log.h"
 #include "http/http.h"
 #include "device/buffer.h"
 #include "device/buffer_lock.h"

rtsp/rtsp.cc

@@ -4,9 +4,9 @@ extern "C" {
 #include "device/buffer.h"
 #include "device/buffer_list.h"
 #include "device/device.h"
-#include "opts/log.h"
-#include "opts/fourcc.h"
-#include "opts/control.h"
+#include "util/opts/log.h"
+#include "util/opts/fourcc.h"
+#include "util/opts/control.h"
 #include "rtsp.h"
 
 };

util/opts/log.c

@@ -1,5 +1,5 @@
-#include "opts/log.h"
-#include "opts/opts.h"
+#include "util/opts/log.h"
+#include "util/opts/opts.h"
 
 #include <string.h>
 

util/opts/opts.c

@@ -1,5 +1,5 @@
 #include "opts.h"
-#include "opts/log.h"
+#include "util/opts/log.h"
 
 #include <stddef.h>
 #include <stdio.h>