Do some hotfixes to reduce mutex contention (but this needs a rework).

[nageru] / video_encoder.cpp

diff --git a/video_encoder.cpp b/video_encoder.cpp
index a622ba2af6640425d72dc5a72de44b4cc8f218e3..ec864d490dcdedfb67d3077ecc354d2856969d3a 100644 (file)
--- a/video_encoder.cpp
+++ b/video_encoder.cpp
@@ -136,14 +136,17 @@ void VideoEncoder::change_x264_bitrate(unsigned rate_kbit)
 
 void VideoEncoder::add_audio(int64_t pts, std::vector<float> audio)
 {
-       lock_guard<mutex> lock(qs_mu);
-       quicksync_encoder->add_audio(pts, audio);
+       {
+               lock_guard<mutex> lock(qs_mu);
+               quicksync_encoder->add_audio(pts, audio);
+       }
        stream_audio_encoder->encode_audio(audio, pts + quicksync_encoder->global_delay());
 }
 
 bool VideoEncoder::is_zerocopy() const
 {
-       lock_guard<mutex> lock(qs_mu);
+       // Explicitly do _not_ take qs_mu; this is called from the mixer,
+       // and qs_mu might be contended. is_zerocopy() is thread safe.
        return quicksync_encoder->is_zerocopy();
 }