X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.h;h=6e37c5226206b3cd8f5cd5b3dcc8ea9b8b0bcecd;hb=fa54f2630c56a1df0046923d6a77b1bd58abf240;hp=6c746c085d929840925db5cea1240656db1df2ad;hpb=d7bba4abb3d56893399578f0540b9ded0a28380f;p=nageru

diff --git a/httpd.h b/httpd.h
index 6c746c0..6e37c52 100644
--- a/httpd.h
+++ b/httpd.h
@@ -1,37 +1,33 @@
 #ifndef _HTTPD_H
 #define _HTTPD_H
 
-// A class dealing with stream output, both to HTTP (thus the class name)
-// and to local output files. Since we generally have very few outputs
-// (end clients are not meant to connect directly to our stream; it should be
-// transcoded by something else and then sent to a reflector), we don't need to
-// care a lot about performance. Thus, we solve this by the simplest possible
-// way, namely having one ffmpeg mux per output.
-
-#include <microhttpd.h>
+// A class dealing with stream output to HTTP.
+
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
+#include <atomic>
 #include <condition_variable>
 #include <deque>
-#include <memory>
 #include <mutex>
+#include <set>
 #include <string>
-#include <vector>
 
 struct MHD_Connection;
-
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavformat/avio.h>
-}
+struct MHD_Daemon;
 
 class HTTPD {
 public:
-	HTTPD(const char *output_filename, int width, int height);
+	HTTPD();
+	~HTTPD();
+
+	// Should be called before start().
+	void set_header(const std::string &data) {
+		header = data;
+	}
+
 	void start(int port);
-	void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts);
+	void add_data(const char *buf, size_t size, bool keyframe);
 
 private:
 	static int answer_to_connection_thunk(void *cls, MHD_Connection *connection,
@@ -46,43 +42,46 @@ private:
 
 	static void free_stream(void *cls);
 
-	class Mux {
-	public:
-		Mux(AVFormatContext *avctx, int width, int height);  // Takes ownership of avctx.
-		~Mux();
-		void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts);
-
-	private:
-		AVFormatContext *avctx;
-		AVStream *avstream_video, *avstream_audio;
-	};
 
 	class Stream {
 	public:
-		Stream(AVOutputFormat *oformat, int width, int height);
+		enum Framing {
+			FRAMING_RAW,
+			FRAMING_METACUBE
+		};
+		Stream(HTTPD *parent, Framing framing) : parent(parent), framing(framing) {}
 
 		static ssize_t reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max);
 		ssize_t reader_callback(uint64_t pos, char *buf, size_t max);
 
-		void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts);
+		enum DataType {
+			DATA_TYPE_HEADER,
+			DATA_TYPE_KEYFRAME,
+			DATA_TYPE_OTHER
+		};
+		void add_data(const char *buf, size_t size, DataType data_type);
+		void stop();
+		HTTPD *get_parent() const { return parent; }
 
 	private:
-		static int write_packet_thunk(void *opaque, uint8_t *buf, int buf_size);
-		int write_packet(uint8_t *buf, int buf_size);
-
-		AVIOContext *avio;
-		std::unique_ptr<Mux> mux;
+		HTTPD *parent;
+		Framing framing;
 
 		std::mutex buffer_mutex;
+		bool should_quit = false;  // Under <buffer_mutex>.
 		std::condition_variable has_buffered_data;
-		std::deque<std::string> buffered_data;  // Protected by <mutex>.
+		std::deque<std::string> buffered_data;  // Protected by <buffer_mutex>.
 		size_t used_of_buffered_data = 0;  // How many bytes of the first element of <buffered_data> that is already used. Protected by <mutex>.
+		size_t seen_keyframe = false;
 	};
 
-	std::vector<Stream *> streams;  // Not owned.
+	MHD_Daemon *mhd = nullptr;
+	std::mutex streams_mutex;
+	std::set<Stream *> streams;  // Not owned.
+	std::string header;
 
-	int width, height;
-	std::unique_ptr<Mux> file_mux;  // To local disk.
+	// Metrics.
+	std::atomic<int64_t> metric_num_connected_clients{0};
 };
 
 #endif  // !defined(_HTTPD_H)