X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=httpd.cpp;h=f6441768bbdde1df3d31e2b42a2cb13430019376;hp=a841cd0bb7311526ce0177d5c40f199cdbc47e03;hb=refs%2Fheads%2Fffmpeg-audio-only;hpb=bd6cb62456225064229a871735ad99ed5c44a671 diff --git a/httpd.cpp b/httpd.cpp index a841cd0..f644176 100644 --- a/httpd.cpp +++ b/httpd.cpp @@ -1,57 +1,69 @@ +#include "httpd.h" + #include +#include +#include #include +#include #include -#include #include - +#include +#include +#include extern "C" { -#include -#include -#include -#include -#include -#include -#include +#include } -#include "httpd.h" - #include "defs.h" -#include "timebase.h" +#include "metacube2.h" +#include "metrics.h" struct MHD_Connection; struct MHD_Response; using namespace std; -HTTPD::HTTPD(const char *output_filename, int width, int height) - : width(width), height(height) +HTTPD::HTTPD() { - AVFormatContext *avctx = avformat_alloc_context(); - avctx->oformat = av_guess_format(NULL, output_filename, NULL); - strcpy(avctx->filename, output_filename); - if (avio_open2(&avctx->pb, output_filename, AVIO_FLAG_WRITE, &avctx->interrupt_callback, NULL) < 0) { - fprintf(stderr, "%s: avio_open2() failed\n", output_filename); - exit(1); - } + global_metrics.add("num_connected_clients", &metric_num_connected_clients, Metrics::TYPE_GAUGE); +} - file_mux.reset(new Mux(avctx, width, height)); +HTTPD::~HTTPD() +{ + stop(); } 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_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::stop() { + if (mhd) { + MHD_quiesce_daemon(mhd); + for (Stream *stream : streams) { + stream->stop(); + } + MHD_stop_daemon(mhd); + mhd = nullptr; + } +} + +void HTTPD::add_data(const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase) +{ + 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, time, timebase); } - file_mux->add_packet(pkt, pts, dts); } int HTTPD::answer_to_connection_thunk(void *cls, MHD_Connection *connection, @@ -68,106 +80,80 @@ int HTTPD::answer_to_connection(MHD_Connection *connection, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) { - printf("url %s\n", url); - AVOutputFormat *oformat = av_guess_format(STREAM_MUX_NAME, nullptr, nullptr); - assert(oformat != nullptr); - HTTPD::Stream *stream = new HTTPD::Stream(oformat, width, height); - streams.push_back(stream); - MHD_Response *response = MHD_create_response_from_callback( - (size_t)-1, 1048576, &HTTPD::Stream::reader_callback_thunk, stream, &HTTPD::free_stream); - int ret = MHD_queue_response(connection, MHD_HTTP_OK, response); - //MHD_destroy_response(response); - - return ret; -} - -void HTTPD::free_stream(void *cls) -{ - HTTPD::Stream *stream = (HTTPD::Stream *)cls; - delete stream; -} + // 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; + } -HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height) - : avctx(avctx) -{ - AVCodec *codec_video = avcodec_find_encoder(AV_CODEC_ID_H264); - avstream_video = avformat_new_stream(avctx, codec_video); - if (avstream_video == nullptr) { - fprintf(stderr, "avformat_new_stream() failed\n"); - exit(1); - } - avstream_video->time_base = AVRational{1, TIMEBASE}; - avstream_video->codec->width = width; - avstream_video->codec->height = height; - avstream_video->codec->time_base = AVRational{1, TIMEBASE}; - avstream_video->codec->ticks_per_frame = 1; // or 2? - - // Colorspace details. Closely correspond to settings in EffectChain_finalize, - // as noted in each comment. - // Note that the H.264 stream also contains this information and depending on the - // mux, this might simply get ignored. See sps_rbsp(). - avstream_video->codec->color_primaries = AVCOL_PRI_BT709; // RGB colorspace (inout_format.color_space). - avstream_video->codec->color_trc = AVCOL_TRC_UNSPECIFIED; // Gamma curve (inout_format.gamma_curve). - avstream_video->codec->colorspace = AVCOL_SPC_SMPTE170M; // YUV colorspace (output_ycbcr_format.luma_coefficients). - avstream_video->codec->color_range = AVCOL_RANGE_MPEG; // Full vs. limited range (output_ycbcr_format.full_range). - avstream_video->codec->chroma_sample_location = AVCHROMA_LOC_LEFT; // Chroma sample location. See chroma_offset_0[] in Mixer::subsample_chroma(). - avstream_video->codec->field_order = AV_FIELD_PROGRESSIVE; - - AVCodec *codec_audio = avcodec_find_encoder(AUDIO_OUTPUT_CODEC); - avstream_audio = avformat_new_stream(avctx, codec_audio); - if (avstream_audio == nullptr) { - fprintf(stderr, "avformat_new_stream() failed\n"); - exit(1); - } - avstream_audio->time_base = AVRational{1, TIMEBASE}; - avstream_audio->codec->bit_rate = AUDIO_OUTPUT_BIT_RATE; - avstream_audio->codec->sample_rate = OUTPUT_FREQUENCY; - avstream_audio->codec->sample_fmt = AUDIO_OUTPUT_SAMPLE_FMT; - avstream_audio->codec->channels = 2; - avstream_audio->codec->channel_layout = AV_CH_LAYOUT_STEREO; - avstream_audio->codec->time_base = AVRational{1, TIMEBASE}; - - if (avformat_write_header(avctx, NULL) < 0) { - fprintf(stderr, "avformat_write_header() failed\n"); - exit(1); + 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; + } + if (endpoints.count(url)) { + pair contents_and_type = endpoints[url].callback(); + MHD_Response *response = MHD_create_response_from_buffer( + contents_and_type.first.size(), &contents_and_type.first[0], MHD_RESPMEM_MUST_COPY); + MHD_add_response_header(response, "Content-type", contents_and_type.second.c_str()); + if (endpoints[url].cors_policy == ALLOW_ALL_ORIGINS) { + MHD_add_response_header(response, "Access-Control-Allow-Origin", "*"); + } + 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; } -} -HTTPD::Mux::~Mux() -{ - av_write_trailer(avctx); - avformat_free_context(avctx); -} + // Small hack; reject unknown /channels/foo. + if (string(url).find("/channels/") == 0) { + string contents = "Not found."; + 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_NOT_FOUND, response); + MHD_destroy_response(response); // Only decreases the refcount; actual free is after the request is done. + return ret; + } -void HTTPD::Mux::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts) -{ - AVPacket pkt_copy; - av_copy_packet(&pkt_copy, &pkt); - if (pkt.stream_index == 0) { - pkt_copy.pts = av_rescale_q(pts, AVRational{1, TIMEBASE}, avstream_video->time_base); - pkt_copy.dts = av_rescale_q(dts, AVRational{1, TIMEBASE}, avstream_video->time_base); - } else if (pkt.stream_index == 1) { - pkt_copy.pts = av_rescale_q(pts, AVRational{1, TIMEBASE}, avstream_audio->time_base); - pkt_copy.dts = av_rescale_q(dts, AVRational{1, TIMEBASE}, avstream_audio->time_base); - } else { - assert(false); + HTTPD::Stream *stream = new HTTPD::Stream(this, framing); + stream->add_data(header.data(), header.size(), Stream::DATA_TYPE_HEADER, AV_NOPTS_VALUE, AVRational{ 1, 0 }); + { + unique_lock lock(streams_mutex); + streams.insert(stream); } + ++metric_num_connected_clients; + *con_cls = stream; - if (av_interleaved_write_frame(avctx, &pkt_copy) < 0) { - fprintf(stderr, "av_interleaved_write_frame() failed\n"); - exit(1); + // 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); // Only decreases the refcount; actual free is after the request is done. + + return ret; } -HTTPD::Stream::Stream(AVOutputFormat *oformat, int width, int height) +void HTTPD::free_stream(void *cls) { - AVFormatContext *avctx = avformat_alloc_context(); - avctx->oformat = oformat; - uint8_t *buf = (uint8_t *)av_malloc(1048576); - avctx->pb = avio_alloc_context(buf, 1048576, 1, this, nullptr, &HTTPD::Stream::write_packet_thunk, nullptr); - avctx->flags = AVFMT_FLAG_CUSTOM_IO; - - mux.reset(new Mux(avctx, width, height)); + HTTPD::Stream *stream = (HTTPD::Stream *)cls; + HTTPD *httpd = stream->get_parent(); + { + unique_lock lock(httpd->streams_mutex); + delete stream; + httpd->streams.erase(stream); + } + --httpd->metric_num_connected_clients; } ssize_t HTTPD::Stream::reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max) @@ -179,7 +165,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()) { @@ -189,6 +178,7 @@ ssize_t HTTPD::Stream::reader_callback(uint64_t pos, char *buf, size_t max) if (max >= len) { // Consume the entire (rest of the) string. memcpy(buf, s.data() + used_of_buffered_data, len); + buf += len; ret += len; max -= len; buffered_data.pop_front(); @@ -196,6 +186,7 @@ ssize_t HTTPD::Stream::reader_callback(uint64_t pos, char *buf, size_t max) } else { // We don't need the entire string; just use the first part of it. memcpy(buf, s.data() + used_of_buffered_data, max); + buf += max; used_of_buffered_data += max; ret += max; max = 0; @@ -205,22 +196,80 @@ 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, int64_t time, AVRational timebase) { - 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) { + 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; + } + + // If we're about to send a keyframe, send a pts metadata block + // to mark its time. + if ((flags & METACUBE_FLAGS_NOT_SUITABLE_FOR_STREAM_START) == 0 && time != AV_NOPTS_VALUE) { + metacube2_pts_packet packet; + packet.type = htobe64(METACUBE_METADATA_TYPE_NEXT_BLOCK_PTS); + packet.pts = htobe64(time); + packet.timebase_num = htobe64(timebase.num); + packet.timebase_den = htobe64(timebase.den); + + 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)); + } + + metacube2_block_header hdr; + memcpy(hdr.sync, METACUBE2_SYNC, sizeof(hdr.sync)); + hdr.size = htonl(buf_size); + 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(); } -