Move http/ and rtsp/ into output/

cmd/camera-streamer/http.c

@@ -3,7 +3,8 @@
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
-#include "rtsp/rtsp.h"
+#include "output/output.h"
+#include "output/rtsp/rtsp.h"
 
 extern unsigned char html_index_html[];
 extern unsigned int html_index_html_len;

cmd/camera-streamer/main.c

@@ -3,7 +3,7 @@
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
-#include "rtsp/rtsp.h"
+#include "output/rtsp/rtsp.h"
 
 #include <signal.h>
 #include <unistd.h>

cmd/camera-streamer/opts.c

@@ -3,7 +3,7 @@
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
 #include "device/camera/camera.h"
-#include "rtsp/rtsp.h"
+#include "output/rtsp/rtsp.h"
 
 camera_options_t camera_options = {
   .path = "",

device/camera/camera_output.c

@@ -8,7 +8,8 @@
 #include "util/opts/fourcc.h"
 #include "device/buffer_list.h"
 #include "util/http/http.h"
-#include "rtsp/rtsp.h"
+#include "output/rtsp/rtsp.h"
+#include "output/output.h"
 
 static const char *jpeg_names[2] = {
   "JPEG",

output/http_ffmpeg.c

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

output/http_h264.c

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

output/http_jpeg.c

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

output/output.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <stdbool.h>
+
+struct http_worker_s;
+struct buffer_s;
+
+// M-JPEG
+void http_snapshot(struct http_worker_s *worker, FILE *stream);
+void http_stream(struct http_worker_s *worker, FILE *stream);
+void http_jpeg_capture(struct buffer_s *buf);
+void http_jpeg_lowres_capture(struct buffer_s *buf);
+bool http_jpeg_needs_buffer();
+void http_option(struct http_worker_s *worker, FILE *stream);
+
+// H264
+bool http_h264_needs_buffer();
+void http_h264_capture(struct buffer_s *buf);
+void http_h264_lowres_capture(struct buffer_s *buf);
+void http_h264_video(struct http_worker_s *worker, FILE *stream);
+bool h264_is_key_frame(struct buffer_s *buf);
+void http_mkv_video(struct http_worker_s *worker, FILE *stream);
+void http_mp4_video(struct http_worker_s *worker, FILE *stream);
+void http_mov_video(struct http_worker_s *worker, FILE *stream);
+
+#define HTTP_LOW_RES_PARAM "res=low"

output/rtsp/rtsp.cc

@@ -7,6 +7,7 @@ extern "C" {
 #include "util/opts/log.h"
 #include "util/opts/fourcc.h"
 #include "util/opts/control.h"
+#include "output/output.h"
 #include "rtsp.h"
 
 };

util/http/http.h

@@ -50,23 +50,3 @@ void http_200(FILE *stream, const char *data);
 void http_404(FILE *stream, const char *data);
 void http_500(FILE *stream, const char *data);
 void *http_enum_params(http_worker_t *worker, FILE *stream, http_param_fn fn, void *opaque);
-
-// M-JPEG
-void http_snapshot(http_worker_t *worker, FILE *stream);
-void http_stream(http_worker_t *worker, FILE *stream);
-void http_jpeg_capture(struct buffer_s *buf);
-void http_jpeg_lowres_capture(struct buffer_s *buf);
-bool http_jpeg_needs_buffer();
-void http_option(http_worker_t *worker, FILE *stream);
-
-// H264
-bool http_h264_needs_buffer();
-void http_h264_capture(buffer_t *buf);
-void http_h264_lowres_capture(buffer_t *buf);
-void http_h264_video(http_worker_t *worker, FILE *stream);
-bool h264_is_key_frame(buffer_t *buf);
-void http_mkv_video(http_worker_t *worker, FILE *stream);
-void http_mp4_video(http_worker_t *worker, FILE *stream);
-void http_mov_video(http_worker_t *worker, FILE *stream);
-
-#define HTTP_LOW_RES_PARAM "res=low"