X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=6bf436478b8df8cd9afb83301b0ec6a330f808c7;hb=e45ebd282e3c6c369475ef0987945eca62ef8f58;hp=401509d265f5404a63119691e345d35f7f954d86;hpb=835643ff858560faf49feee4cbb1a91d5e97e00c;p=nageru diff --git a/httpd.cpp b/httpd.cpp index 401509d..6bf4364 100644 --- a/httpd.cpp +++ b/httpd.cpp @@ -19,6 +19,7 @@ extern "C" { #include "httpd.h" #include "defs.h" +#include "flags.h" #include "timebase.h" struct MHD_Connection; @@ -47,32 +48,6 @@ void HTTPD::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts) for (Stream *stream : streams) { stream->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, @@ -89,9 +64,11 @@ 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(STREAM_MUX_NAME, nullptr, nullptr); + AVOutputFormat *oformat = av_guess_format(global_flags.stream_mux_name.c_str(), nullptr, nullptr); assert(oformat != nullptr); - HTTPD::Stream *stream = new HTTPD::Stream(oformat, width, height); + + int time_base = global_flags.stream_coarse_timebase ? COARSE_TIMEBASE : TIMEBASE; + HTTPD::Stream *stream = new HTTPD::Stream(oformat, width, height, time_base); { unique_lock lock(streams_mutex); streams.insert(stream); @@ -135,110 +112,23 @@ void HTTPD::request_completed(struct MHD_Connection *connection, void **con_cls, } } -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->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}; - 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; - if (avctx->oformat->flags & AVFMT_GLOBALHEADER) { - avstream_video->codec->flags = AV_CODEC_FLAG_GLOBAL_HEADER; - } - - 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 (avctx->oformat->flags & AVFMT_GLOBALHEADER) { - avstream_audio->codec->flags = AV_CODEC_FLAG_GLOBAL_HEADER; - } - - 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); - } -} - -HTTPD::Mux::~Mux() -{ - av_write_trailer(avctx); - av_free(avctx->pb->buffer); - av_free(avctx->pb); - avformat_free_context(avctx); -} - -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) { - 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); - } - - if (av_interleaved_write_frame(avctx, &pkt_copy) < 0) { - fprintf(stderr, "av_interleaved_write_frame() failed\n"); - exit(1); - } - - av_packet_unref(&pkt_copy); -} - -HTTPD::Stream::Stream(AVOutputFormat *oformat, int width, int height) +HTTPD::Stream::Stream(AVOutputFormat *oformat, int width, int height, int time_base) { 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; - mux.reset(new Mux(avctx, width, height)); + mux.reset(new Mux(avctx, width, height, video_codec, time_base)); } ssize_t HTTPD::Stream::reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max) @@ -260,6 +150,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(); @@ -267,6 +158,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;