X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=3fbab5d6d6630e97e6133a2df44b890b8484cf50;hb=bea1be71fd06888ac03fcddb47f6d497f8e07aab;hp=d0be7a3bfd47faacbebb950ba5c915c174ade57e;hpb=12958b47efa45a14a1a31a32cd281b86787f1aee;p=nageru

diff --git a/httpd.cpp b/httpd.cpp
index d0be7a3..3fbab5d 100644
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -1,5 +1,6 @@
 #include <arpa/inet.h>
 #include <assert.h>
+#include <endian.h>
 #include <microhttpd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,11 +26,13 @@ HTTPD::HTTPD()
 
 HTTPD::~HTTPD()
 {
-	MHD_quiesce_daemon(mhd);
-	for (Stream *stream : streams) {
-		stream->stop();
+	if (mhd) {
+		MHD_quiesce_daemon(mhd);
+		for (Stream *stream : streams) {
+			stream->stop();
+		}
+		MHD_stop_daemon(mhd);
 	}
-	MHD_stop_daemon(mhd);
 }
 
 void HTTPD::start(int port)
@@ -38,8 +41,11 @@ void HTTPD::start(int port)
 	                       port,
 	                       nullptr, nullptr,
 	                       &answer_to_connection_thunk, this,
-	                       MHD_OPTION_NOTIFY_COMPLETED, &request_completed_thunk, this,
+	                       MHD_OPTION_NOTIFY_COMPLETED, nullptr, this,
 	                       MHD_OPTION_END);
+	if (mhd == nullptr) {
+		fprintf(stderr, "Warning: Could not open HTTP server. (Port already in use?)\n");
+	}
 }
 
 void HTTPD::add_data(const char *buf, size_t size, bool keyframe)
@@ -72,7 +78,7 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 		framing = HTTPD::Stream::FRAMING_RAW;
 	}
 
-	HTTPD::Stream *stream = new HTTPD::Stream(framing);
+	HTTPD::Stream *stream = new HTTPD::Stream(this, framing);
 	stream->add_data(header.data(), header.size(), Stream::DATA_TYPE_HEADER);
 	{
 		unique_lock<mutex> lock(streams_mutex);
@@ -89,36 +95,19 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 		MHD_add_response_header(response, "Content-encoding", "metacube");
 	}
 	int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
-	//MHD_destroy_response(response);
+	MHD_destroy_response(response);  // Only decreases the refcount; actual free is after the request is done.
 
 	return ret;
 }
 
 void HTTPD::free_stream(void *cls)
 {
-	// FIXME: When is this actually called, if ever?
-	// Also, shouldn't we remove it from streams?
 	HTTPD::Stream *stream = (HTTPD::Stream *)cls;
-	delete stream;
-}
-
-void HTTPD::request_completed_thunk(void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe)
-{
-	HTTPD *httpd = (HTTPD *)cls;
-	return httpd->request_completed(connection, con_cls, toe);
-}
-
-void HTTPD::request_completed(struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe)
-{
-	if (con_cls == nullptr) {
-		// Request was never set up.
-		return;
-	}
-	HTTPD::Stream *stream = (HTTPD::Stream *)*con_cls;
+	HTTPD *httpd = stream->get_parent();
 	{
-		unique_lock<mutex> lock(streams_mutex);
+		unique_lock<mutex> lock(httpd->streams_mutex);
 		delete stream;
-		streams.erase(stream);
+		httpd->streams.erase(stream);
 	}
 }
 
@@ -191,6 +180,26 @@ void HTTPD::Stream::add_data(const char *buf, size_t buf_size, HTTPD::Stream::Da
 		buffered_data.emplace_back((char *)&hdr, sizeof(hdr));
 	}
 	buffered_data.emplace_back(buf, buf_size);
+
+	// Send a Metacube2 timestamp every keyframe.
+	if (framing == FRAMING_METACUBE && data_type == DATA_TYPE_KEYFRAME) {
+		timespec now;
+		clock_gettime(CLOCK_REALTIME, &now);
+
+		metacube2_timestamp_packet packet;
+		packet.type = htobe64(METACUBE_METADATA_TYPE_ENCODER_TIMESTAMP);
+		packet.tv_sec = htobe64(now.tv_sec);
+		packet.tv_nsec = htobe64(now.tv_nsec);
+
+		metacube2_block_header hdr;
+		memcpy(hdr.sync, METACUBE2_SYNC, sizeof(hdr.sync));
+		hdr.size = htonl(sizeof(packet));
+		hdr.flags = htons(METACUBE_FLAGS_METADATA);
+		hdr.csum = htons(metacube2_compute_crc(&hdr));
+		buffered_data.emplace_back((char *)&hdr, sizeof(hdr));
+		buffered_data.emplace_back((char *)&packet, sizeof(packet));
+	}
+
 	has_buffered_data.notify_all();	
 }