X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=e71f40e2e52844604849cba0ff395d8a85c83d53;hb=35d4e46a1e3628c7be6566f2a985bc7da435cdf9;hp=281bbcf0b05e7e1ebed86403016ff57f7d0eab61;hpb=653ea43b8c06065a764b2f8960b1858beb83aa73;p=nageru

diff --git a/httpd.cpp b/httpd.cpp
index 281bbcf..e71f40e 100644
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -69,12 +69,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);
 
@@ -127,7 +129,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 +170,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));