// 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) {
void VideoEncoder::add_audio(int64_t pts, std::vector<float> audio)
{
- lock_guard<mutex> lock(qs_mu);
- quicksync_encoder->add_audio(pts, 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_audio_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
+ // and never called in parallel with do_cut() (both happen only
+ // from the mixer thread).
return quicksync_encoder->is_zerocopy();
}
int time_base = global_flags.stream_coarse_timebase ? COARSE_TIMEBASE : TIMEBASE;
stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_codec_parameters().get(), time_base,
- /*write_callback=*/nullptr));
+ /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, { &stream_mux_metrics }));
+ stream_mux_metrics.init({{ "destination", "http" }});
}
int VideoEncoder::write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time)