X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=13d2a7138e3c362ab796e025f7e1fa867f7dde6c;hb=96cb6414f85e0ef4d660b7bd56267303e80fcd05;hp=5900e0ab1425abce934571b8013d4252566d5efc;hpb=acc9fe1e6be3e7b1c95f44e45728ec3beae576b0;p=nageru diff --git a/httpd.cpp b/httpd.cpp index 5900e0a..13d2a71 100644 --- a/httpd.cpp +++ b/httpd.cpp @@ -1,52 +1,59 @@ +#include "httpd.h" + #include +#include +#include #include +#include #include -#include #include - -extern "C" { -#include -#include -#include -#include -#include -#include -#include -} - -#include - -#include "httpd.h" +#include +#include +#include #include "defs.h" -#include "flags.h" -#include "timebase.h" +#include "metacube2.h" +#include "metrics.h" struct MHD_Connection; struct MHD_Response; using namespace std; -HTTPD::HTTPD(int width, int height) - : width(width), height(height) +HTTPD::HTTPD() { + global_metrics.add("num_connected_clients", &metric_num_connected_clients, Metrics::TYPE_GAUGE); +} + +HTTPD::~HTTPD() +{ + if (mhd) { + MHD_quiesce_daemon(mhd); + for (Stream *stream : streams) { + stream->stop(); + } + MHD_stop_daemon(mhd); + } } void HTTPD::start(int port) { - MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL_INTERNALLY | MHD_USE_DUAL_STACK, - port, - nullptr, nullptr, - &answer_to_connection_thunk, this, - MHD_OPTION_NOTIFY_COMPLETED, &request_completed_thunk, this, - MHD_OPTION_END); + mhd = MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL_INTERNALLY | MHD_USE_DUAL_STACK, + port, + nullptr, nullptr, + &answer_to_connection_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_packet(const AVPacket &pkt, int64_t pts, int64_t dts) +void HTTPD::add_data(const char *buf, size_t size, bool keyframe) { unique_lock lock(streams_mutex); for (Stream *stream : streams) { - stream->add_packet(pkt, pts, dts); + stream->add_data(buf, size, keyframe ? Stream::DATA_TYPE_KEYFRAME : Stream::DATA_TYPE_OTHER); } } @@ -64,87 +71,57 @@ int HTTPD::answer_to_connection(MHD_Connection *connection, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) { - AVOutputFormat *oformat = av_guess_format(global_flags.stream_mux_name.c_str(), nullptr, nullptr); - assert(oformat != nullptr); + // See if the URL ends in “.metacube”. + HTTPD::Stream::Framing framing; + if (strstr(url, ".metacube") == url + strlen(url) - strlen(".metacube")) { + framing = HTTPD::Stream::FRAMING_METACUBE; + } else { + framing = HTTPD::Stream::FRAMING_RAW; + } - // TODO: This is an ugly place to have this logic. - const int bit_rate = global_flags.stream_audio_codec_name.empty() ? - DEFAULT_AUDIO_OUTPUT_BIT_RATE : - global_flags.stream_audio_codec_bitrate; + if (strcmp(url, "/metrics") == 0) { + string contents = global_metrics.serialize(); + MHD_Response *response = MHD_create_response_from_buffer( + contents.size(), &contents[0], MHD_RESPMEM_MUST_COPY); + MHD_add_response_header(response, "Content-type", "text/plain"); + int ret = MHD_queue_response(connection, MHD_HTTP_OK, response); + MHD_destroy_response(response); // Only decreases the refcount; actual free is after the request is done. + return ret; + } - int time_base = global_flags.stream_coarse_timebase ? COARSE_TIMEBASE : TIMEBASE; - HTTPD::Stream *stream = new HTTPD::Stream(oformat, width, height, time_base, bit_rate); + HTTPD::Stream *stream = new HTTPD::Stream(this, framing); + stream->add_data(header.data(), header.size(), Stream::DATA_TYPE_HEADER); { unique_lock lock(streams_mutex); streams.insert(stream); } + ++metric_num_connected_clients; *con_cls = stream; // Does not strictly have to be equal to MUX_BUFFER_SIZE. MHD_Response *response = MHD_create_response_from_callback( (size_t)-1, MUX_BUFFER_SIZE, &HTTPD::Stream::reader_callback_thunk, stream, &HTTPD::free_stream); + // TODO: Content-type? + if (framing == HTTPD::Stream::FRAMING_METACUBE) { + 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 lock(streams_mutex); + unique_lock lock(httpd->streams_mutex); delete stream; - streams.erase(stream); - } -} - -HTTPD::Stream::Stream(AVOutputFormat *oformat, int width, int height, int time_base, int bit_rate) -{ - AVFormatContext *avctx = avformat_alloc_context(); - avctx->oformat = oformat; - uint8_t *buf = (uint8_t *)av_malloc(MUX_BUFFER_SIZE); - avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, this, nullptr, &HTTPD::Stream::write_packet_thunk, nullptr); - - Mux::Codec video_codec; - if (global_flags.uncompressed_video_to_http) { - video_codec = Mux::CODEC_NV12; - } else { - video_codec = Mux::CODEC_H264; - } - - avctx->flags = AVFMT_FLAG_CUSTOM_IO; - - // TODO: This is an ugly place to have this logic. - const string codec_name = global_flags.stream_audio_codec_name.empty() ? - AUDIO_OUTPUT_CODEC_NAME : - global_flags.stream_audio_codec_name; - - AVCodec *codec_audio = avcodec_find_encoder_by_name(codec_name.c_str()); - if (codec_audio == nullptr) { - fprintf(stderr, "ERROR: Could not find codec '%s'\n", codec_name.c_str()); - exit(1); + httpd->streams.erase(stream); } - - mux.reset(new Mux(avctx, width, height, video_codec, codec_audio, time_base, bit_rate)); + --httpd->metric_num_connected_clients; } ssize_t HTTPD::Stream::reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max) @@ -156,7 +133,10 @@ ssize_t HTTPD::Stream::reader_callback_thunk(void *cls, uint64_t pos, char *buf, ssize_t HTTPD::Stream::reader_callback(uint64_t pos, char *buf, size_t max) { unique_lock lock(buffer_mutex); - has_buffered_data.wait(lock, [this]{ return !buffered_data.empty(); }); + has_buffered_data.wait(lock, [this]{ return should_quit || !buffered_data.empty(); }); + if (should_quit) { + return 0; + } ssize_t ret = 0; while (max > 0 && !buffered_data.empty()) { @@ -184,22 +164,61 @@ ssize_t HTTPD::Stream::reader_callback(uint64_t pos, char *buf, size_t max) return ret; } -void HTTPD::Stream::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts) +void HTTPD::Stream::add_data(const char *buf, size_t buf_size, HTTPD::Stream::DataType data_type) { - mux->add_packet(pkt, pts, dts); -} + if (buf_size == 0) { + return; + } + if (data_type == DATA_TYPE_KEYFRAME) { + seen_keyframe = true; + } else if (data_type == DATA_TYPE_OTHER && !seen_keyframe) { + // Start sending only once we see a keyframe. + return; + } -int HTTPD::Stream::write_packet_thunk(void *opaque, uint8_t *buf, int buf_size) -{ - HTTPD::Stream *stream = (HTTPD::Stream *)opaque; - return stream->write_packet(buf, buf_size); + unique_lock lock(buffer_mutex); + + if (framing == FRAMING_METACUBE) { + metacube2_block_header hdr; + memcpy(hdr.sync, METACUBE2_SYNC, sizeof(hdr.sync)); + hdr.size = htonl(buf_size); + int flags = 0; + if (data_type == DATA_TYPE_HEADER) { + flags |= METACUBE_FLAGS_HEADER; + } else if (data_type == DATA_TYPE_OTHER) { + flags |= METACUBE_FLAGS_NOT_SUITABLE_FOR_STREAM_START; + } + hdr.flags = htons(flags); + hdr.csum = htons(metacube2_compute_crc(&hdr)); + 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(); } -int HTTPD::Stream::write_packet(uint8_t *buf, int buf_size) +void HTTPD::Stream::stop() { unique_lock lock(buffer_mutex); - buffered_data.emplace_back((char *)buf, buf_size); - has_buffered_data.notify_all(); - return buf_size; + should_quit = true; + has_buffered_data.notify_all(); } -