X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=video_encoder.cpp;h=d2f5dbe43d5a625583a3f9b60bf19f768a679a54;hb=4a0187ffb4075b4d217b8d9e9c96cac548b199d8;hp=61a1305c2dbd1e986a9ab78eb452d90859879925;hpb=f932301ce7f23ef4c14dd0d4f52dee662d0b4ef6;p=nageru

diff --git a/video_encoder.cpp b/video_encoder.cpp
index 61a1305..d2f5dbe 100644
--- a/video_encoder.cpp
+++ b/video_encoder.cpp
@@ -96,7 +96,8 @@ void VideoEncoder::do_cut(int frame)
 	// the same time, it means pts could come out of order to the stream mux,
 	// and we need to plug it until the shutdown is complete.
 	stream_mux->plug();
-	lock_guard<mutex> lock(qs_mu);
+	lock(qs_mu, qs_audio_mu);
+	lock_guard<mutex> lock1(qs_mu, adopt_lock), lock2(qs_audio_mu, adopt_lock);
 	QuickSyncEncoder *old_encoder = quicksync_encoder.release();  // When we go C++14, we can use move capture instead.
 	X264Encoder *old_x264_encoder = nullptr;
 	if (global_flags.x264_video_to_disk) {
@@ -136,8 +137,11 @@ void VideoEncoder::change_x264_bitrate(unsigned rate_kbit)
 
 void VideoEncoder::add_audio(int64_t pts, std::vector<float> audio)
 {
+	// Take only qs_audio_mu, since add_audio() is thread safe
+	// (we can only conflict with do_cut(), which takes qs_audio_mu)
+	// and we don't want to contend with begin_frame().
 	{
-		lock_guard<mutex> lock(qs_mu);
+		lock_guard<mutex> lock(qs_audio_mu);
 		quicksync_encoder->add_audio(pts, audio);
 	}
 	stream_audio_encoder->encode_audio(audio, pts + quicksync_encoder->global_delay());
@@ -146,7 +150,9 @@ void VideoEncoder::add_audio(int64_t pts, std::vector<float> audio)
 bool VideoEncoder::is_zerocopy() const
 {
 	// Explicitly do _not_ take qs_mu; this is called from the mixer,
-	// and qs_mu might be contended. is_zerocopy() is thread safe.
+	// and qs_mu might be contended. is_zerocopy() is thread safe
+	// and never called in parallel with do_cut() (both happen only
+	// from the mixer thread).
 	return quicksync_encoder->is_zerocopy();
 }
 
@@ -213,7 +219,7 @@ int VideoEncoder::write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType t
 		stream_mux_header.append((char *)buf, buf_size);
 		httpd->set_header(stream_mux_header);
 	} else {
-		httpd->add_data((char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT);
+		httpd->add_data((char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT, time, AVRational{ AV_TIME_BASE, 1 });
 	}
 	return buf_size;
 }