X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=f148fa1d22b889c2a64d8576a34e2ee8cce118de;hb=59d1397c90bd594efb80734a2e6f213fb8c5e584;hp=359bd7285d98c9cf50586e82ee73156551d9f134;hpb=0f079f3c88e85d49208836642a579b4fd520fb76;p=nageru

diff --git a/httpd.cpp b/httpd.cpp
index 359bd72..f148fa1 100644
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -30,8 +30,10 @@ HTTPD::HTTPD(const char *output_filename, int width, int 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);
+	int ret = avio_open2(&avctx->pb, output_filename, 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", output_filename, av_make_error_string(tmp, sizeof(tmp), ret));
 		exit(1);
 	}
 
@@ -69,12 +71,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);
 
@@ -113,21 +117,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<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 +172,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));