X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=6a92699936c45ef3a0c324064512af69abd2d2b8;hb=00ea527bd5605717ea8f353058bc72fa2c2aac08;hp=359bd7285d98c9cf50586e82ee73156551d9f134;hpb=0f079f3c88e85d49208836642a579b4fd520fb76;p=nageru diff --git a/httpd.cpp b/httpd.cpp index 359bd72..6a92699 100644 --- a/httpd.cpp +++ b/httpd.cpp @@ -14,6 +14,8 @@ extern "C" { #include } +#include + #include "httpd.h" #include "defs.h" @@ -24,18 +26,9 @@ struct MHD_Response; using namespace std; -HTTPD::HTTPD(const char *output_filename, int width, int height) +HTTPD::HTTPD(int width, int height) : width(width), height(height) { - 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); - } - - file_mux.reset(new Mux(avctx, width, height)); } void HTTPD::start(int port) @@ -43,15 +36,43 @@ 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); + &answer_to_connection_thunk, this, + MHD_OPTION_NOTIFY_COMPLETED, &request_completed_thunk, this, + MHD_OPTION_END); } void HTTPD::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts) { + unique_lock lock(streams_mutex); for (Stream *stream : streams) { stream->add_packet(pkt, pts, dts); } - file_mux->add_packet(pkt, pts, dts); + if (file_mux) { + file_mux->add_packet(pkt, pts, dts); + } +} + +void HTTPD::open_output_file(const string &filename) +{ + AVFormatContext *avctx = avformat_alloc_context(); + avctx->oformat = av_guess_format(NULL, filename.c_str(), NULL); + assert(filename.size() < sizeof(avctx->filename) - 1); + strcpy(avctx->filename, filename.c_str()); + + string url = "file:" + filename; + int ret = avio_open2(&avctx->pb, url.c_str(), AVIO_FLAG_WRITE, &avctx->interrupt_callback, NULL); + if (ret < 0) { + char tmp[AV_ERROR_MAX_STRING_SIZE]; + fprintf(stderr, "%s: avio_open2() failed: %s\n", filename.c_str(), av_make_error_string(tmp, sizeof(tmp), ret)); + exit(1); + } + + file_mux.reset(new Mux(avctx, width, height)); +} + +void HTTPD::close_output_file() +{ + file_mux.reset(); } int HTTPD::answer_to_connection_thunk(void *cls, MHD_Connection *connection, @@ -68,13 +89,18 @@ 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("mpegts", nullptr, nullptr); + 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); + { + unique_lock lock(streams_mutex); + streams.insert(stream); + } + *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, 1048576, &HTTPD::Stream::reader_callback_thunk, stream, &HTTPD::free_stream); + (size_t)-1, MUX_BUFFER_SIZE, &HTTPD::Stream::reader_callback_thunk, stream, &HTTPD::free_stream); int ret = MHD_queue_response(connection, MHD_HTTP_OK, response); //MHD_destroy_response(response); @@ -83,10 +109,32 @@ int HTTPD::answer_to_connection(MHD_Connection *connection, 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; + { + unique_lock lock(streams_mutex); + delete stream; + streams.erase(stream); + } +} + HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height) : avctx(avctx) { @@ -97,6 +145,8 @@ HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height) exit(1); } avstream_video->time_base = AVRational{1, TIMEBASE}; + avstream_video->codec->codec_type = AVMEDIA_TYPE_VIDEO; + avstream_video->codec->codec_id = AV_CODEC_ID_H264; avstream_video->codec->width = width; avstream_video->codec->height = height; avstream_video->codec->time_base = AVRational{1, TIMEBASE}; @@ -113,21 +163,26 @@ HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height) 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(AV_CODEC_ID_MP3); + 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 = 256000; + avstream_audio->codec->bit_rate = AUDIO_OUTPUT_BIT_RATE; avstream_audio->codec->sample_rate = OUTPUT_FREQUENCY; - avstream_audio->codec->sample_fmt = AV_SAMPLE_FMT_FLTP; + 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) { + AVDictionary *options = NULL; + vector> opts = MUX_OPTS; + for (pair opt : opts) { + av_dict_set(&options, opt.first.c_str(), opt.second.c_str(), 0); + } + if (avformat_write_header(avctx, &options) < 0) { fprintf(stderr, "avformat_write_header() failed\n"); exit(1); } @@ -141,6 +196,12 @@ HTTPD::Mux::~Mux() void HTTPD::Mux::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts) { + if (!seen_keyframe && !(pkt.stream_index == 0 && (pkt.flags & AV_PKT_FLAG_KEY))) { + // Wait until we see the first (video) key frame. + return; + } + seen_keyframe = true; + AVPacket pkt_copy; av_copy_packet(&pkt_copy, &pkt); if (pkt.stream_index == 0) { @@ -163,8 +224,8 @@ HTTPD::Stream::Stream(AVOutputFormat *oformat, int width, int height) { 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); + 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); avctx->flags = AVFMT_FLAG_CUSTOM_IO; mux.reset(new Mux(avctx, width, height));