X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fkaeru.cpp;h=9d9738391082a484cf3338361c2746aff1aa5ec7;hb=2c9a83aeae44dae6a0bbfbae33719976e6d527af;hp=b6ba231c43d3be0dd07c9f7f5ebdc53f6fc1499f;hpb=131a051c4cd3719a9be415386fdf0f4e15da7c66;p=nageru

diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp
index b6ba231..9d97383 100644
--- a/nageru/kaeru.cpp
+++ b/nageru/kaeru.cpp
@@ -31,6 +31,8 @@ BasicStats *global_basic_stats = nullptr;
 QuittableSleeper should_quit;
 MuxMetrics stream_mux_metrics;
 
+namespace {
+
 int write_packet(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time)
 {
 	static bool seen_sync_markers = false;
@@ -47,13 +49,15 @@ int write_packet(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType ty
 
 	if (type == AVIO_DATA_MARKER_HEADER) {
 		stream_mux_header.append((char *)buf, buf_size);
-		httpd->set_header(stream_mux_header);
+		httpd->set_header(HTTPD::MAIN_STREAM, stream_mux_header);
 	} else {
-		httpd->add_data((char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT, time, AVRational{ AV_TIME_BASE, 1 });
+		httpd->add_data(HTTPD::MAIN_STREAM, (char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT, time, AVRational{ AV_TIME_BASE, 1 });
 	}
 	return buf_size;
 }
 
+}  // namespace
+
 unique_ptr<Mux> create_mux(HTTPD *httpd, AVOutputFormat *oformat, X264Encoder *x264_encoder, AudioEncoder *audio_encoder)
 {
 	AVFormatContext *avctx = avformat_alloc_context();
@@ -69,7 +73,7 @@ unique_ptr<Mux> create_mux(HTTPD *httpd, AVOutputFormat *oformat, X264Encoder *x
 
 	unique_ptr<Mux> mux;
 	mux.reset(new Mux(avctx, global_flags.width, global_flags.height, Mux::CODEC_H264, video_extradata, audio_encoder->get_codec_parameters().get(),
-		get_color_space(global_flags.ycbcr_rec709_coefficients), Mux::WITH_AUDIO, COARSE_TIMEBASE,
+		get_color_space(global_flags.ycbcr_rec709_coefficients), COARSE_TIMEBASE,
 	        /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, { &stream_mux_metrics }));
 	stream_mux_metrics.init({{ "destination", "http" }});
 	return mux;
@@ -87,7 +91,7 @@ void video_frame_callback(FFmpegCapture *video, X264Encoder *x264_encoder, Audio
 		ts.ts.push_back(steady_clock::now());
 
 		video_pts = av_rescale_q(video_pts, video_timebase, AVRational{ 1, TIMEBASE });
-		int64_t frame_duration = TIMEBASE * video_format.frame_rate_den / video_format.frame_rate_nom;
+		int64_t frame_duration = int64_t(TIMEBASE) * video_format.frame_rate_den / video_format.frame_rate_nom;
 		x264_encoder->add_frame(video_pts, frame_duration, video->get_current_frame_ycbcr_format().luma_coefficients, video_frame.data + video_offset, ts);
 		global_basic_stats->update(frame_num++, /*dropped_frames=*/0);
 	}
@@ -221,6 +225,7 @@ int main(int argc, char *argv[])
 
 	video.stop_dequeue_thread();
 	// Stop the x264 encoder before killing the mux it's writing to.
+	global_x264_encoder = nullptr;
 	x264_encoder.reset();
 	return 0;
 }