Add some useful (pending) upstream patches that have not gone in yet.

[nageru] / httpd.cpp

diff --git a/httpd.cpp b/httpd.cpp
index a841cd0bb7311526ce0177d5c40f199cdbc47e03..29923f9430413ee5dec3175e0aaae42a7f257cf1 100644 (file)
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -24,18 +24,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)
@@ -51,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,
@@ -73,8 +88,10 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
        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);
 
@@ -127,7 +144,12 @@ HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height)
        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<pair<string, string>> opts = MUX_OPTS;
+       for (pair<string, string> 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);
        }
@@ -163,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));