X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=kaeru.cpp;h=6d98cce1791992a47df17663b77d5159169061fd;hb=d3e48df512d9476d3849227067792a3537bb094e;hp=efbb4f11341360863f7bc8383c7cce299bb45bea;hpb=868450678563ed2c9fd5240dca704d87371d1478;p=nageru

diff --git a/kaeru.cpp b/kaeru.cpp
index efbb4f1..6d98cce 100644
--- a/kaeru.cpp
+++ b/kaeru.cpp
@@ -8,6 +8,7 @@
 #include "ffmpeg_capture.h"
 #include "mixer.h"
 #include "mux.h"
+#include "quittable_sleeper.h"
 #include "timebase.h"
 #include "x264_encoder.h"
 
@@ -28,6 +29,7 @@ Mixer *global_mixer = nullptr;
 X264Encoder *global_x264_encoder = nullptr;
 int frame_num = 0;
 BasicStats *global_basic_stats = nullptr;
+QuittableSleeper should_quit;
 MuxMetrics stream_mux_metrics;
 
 int write_packet(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time)
@@ -62,6 +64,7 @@ unique_ptr<Mux> create_mux(HTTPD *httpd, AVOutputFormat *oformat, X264Encoder *x
 	avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, httpd, nullptr, nullptr, nullptr);
 	avctx->pb->write_data_type = &write_packet;
 	avctx->pb->ignore_boundary_point = 1;
+	avctx->flags = AVFMT_FLAG_CUSTOM_IO;
 
 	string video_extradata = x264_encoder->get_global_headers();
 
@@ -146,16 +149,21 @@ void adjust_bitrate(int signal)
 	} else if (signal == SIGUSR2) {
 		new_bitrate -= 100;
 		if (new_bitrate < 100) {
-			fprintf(stderr, "Ignoring SIGUSR1, can't decrease bitrate below 100 kbit/sec (currently at %d kbit/sec)\n",
+			fprintf(stderr, "Ignoring SIGUSR2, can't decrease bitrate below 100 kbit/sec (currently at %d kbit/sec)\n",
 				global_flags.x264_bitrate);
 		} else {
-			fprintf(stderr, "Decreasing bitrate to %d kbit/sec due to SIGUSR1.\n", new_bitrate);
+			fprintf(stderr, "Decreasing bitrate to %d kbit/sec due to SIGUSR2.\n", new_bitrate);
 			global_flags.x264_bitrate = new_bitrate;
 			global_x264_encoder->change_bitrate(new_bitrate);
 		}
 	}
 }
 
+void request_quit(int signal)
+{
+	should_quit.quit();
+}
+
 int main(int argc, char *argv[])
 {
 	parse_flags(PROGRAM_KAERU, argc, argv);
@@ -174,25 +182,23 @@ int main(int argc, char *argv[])
 	assert(oformat != nullptr);
 
 	unique_ptr<AudioEncoder> audio_encoder;
-	if (global_flags.transcode_audio) {
-		if (global_flags.stream_audio_codec_name.empty()) {
-			audio_encoder.reset(new AudioEncoder(AUDIO_OUTPUT_CODEC_NAME, DEFAULT_AUDIO_OUTPUT_BIT_RATE, oformat));
-		} else {
-			audio_encoder.reset(new AudioEncoder(global_flags.stream_audio_codec_name, global_flags.stream_audio_codec_bitrate, oformat));
-		}
+	if (global_flags.stream_audio_codec_name.empty()) {
+		audio_encoder.reset(new AudioEncoder(AUDIO_OUTPUT_CODEC_NAME, DEFAULT_AUDIO_OUTPUT_BIT_RATE, oformat));
+	} else {
+		audio_encoder.reset(new AudioEncoder(global_flags.stream_audio_codec_name, global_flags.stream_audio_codec_bitrate, oformat));
 	}
 
-	X264Encoder x264_encoder(oformat);
-	unique_ptr<Mux> http_mux = create_mux(&httpd, oformat, &x264_encoder, audio_encoder.get());
+	unique_ptr<X264Encoder> x264_encoder(new X264Encoder(oformat));
+	unique_ptr<Mux> http_mux = create_mux(&httpd, oformat, x264_encoder.get(), audio_encoder.get());
 	if (global_flags.transcode_audio) {
 		audio_encoder->add_mux(http_mux.get());
 	}
-	x264_encoder.add_mux(http_mux.get());
-	global_x264_encoder = &x264_encoder;
+	x264_encoder->add_mux(http_mux.get());
+	global_x264_encoder = x264_encoder.get();
 
 	FFmpegCapture video(argv[optind], global_flags.width, global_flags.height);
 	video.set_pixel_format(FFmpegCapture::PixelFormat_NV12);
-	video.set_frame_callback(bind(video_frame_callback, &video, &x264_encoder, audio_encoder.get(), _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11));
+	video.set_frame_callback(bind(video_frame_callback, &video, x264_encoder.get(), audio_encoder.get(), _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11));
 	if (!global_flags.transcode_audio) {
 		video.set_audio_callback(bind(audio_frame_callback, http_mux.get(), _1, _2));
 	}
@@ -202,12 +208,18 @@ int main(int argc, char *argv[])
 
 	BasicStats basic_stats(/*verbose=*/false);
 	global_basic_stats = &basic_stats;
-	httpd.start(9095);
+	httpd.start(global_flags.http_port);
 
 	signal(SIGUSR1, adjust_bitrate);
 	signal(SIGUSR2, adjust_bitrate);
+	signal(SIGINT, request_quit);
 
-	for ( ;; ) {
-		sleep(3600);
+	while (!should_quit.should_quit()) {
+		should_quit.sleep_for(hours(1000));
 	}
+
+	video.stop_dequeue_thread();
+	// Stop the x264 encoder before killing the mux it's writing to.
+	x264_encoder.reset();
+	return 0;
 }