X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=29923f9430413ee5dec3175e0aaae42a7f257cf1;hb=1df3b5084361492b53047f5266890da04ca36466;hp=3beff80e53dae05614868104f7f9ad3ad7b5ef25;hpb=f39a8c954aec316e8654fc1ed414d9b1dce9cb7e;p=nageru diff --git a/httpd.cpp b/httpd.cpp index 3beff80..29923f9 100644 --- a/httpd.cpp +++ b/httpd.cpp @@ -1,28 +1,32 @@ -#include -#include #include +#include +#include +#include +#include extern "C" { #include +#include +#include +#include +#include +#include +#include } #include "httpd.h" + +#include "defs.h" #include "timebase.h" +struct MHD_Connection; +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) @@ -38,7 +42,31 @@ void HTTPD::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts) 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); + 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, @@ -56,12 +84,14 @@ int HTTPD::answer_to_connection(MHD_Connection *connection, 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); + + // 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); @@ -94,27 +124,32 @@ HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height) // 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_BT709; // Gamma curve (inout_format.gamma_curve). - avstream_video->codec->colorspace = AVCOL_SPC_BT709; // YUV colorspace (output_ycbcr_format.luma_coefficients). - avstream_video->codec->color_range = AVCOL_RANGE_JPEG; // Full vs. limited range (output_ycbcr_format.full_range). + 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(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->sample_rate = 48000; - avstream_audio->codec->sample_fmt = AV_SAMPLE_FMT_FLTP; + 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) { + 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); } @@ -150,8 +185,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));