From 00aba464cdf1063131e6fa5e99c48668499cbb28 Mon Sep 17 00:00:00 2001 From: ronag Date: Fri, 17 Aug 2018 15:18:38 +0200 Subject: [PATCH] fix(ffmpeg): use boost lock_guard --- src/modules/ffmpeg/producer/av_producer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/ffmpeg/producer/av_producer.cpp b/src/modules/ffmpeg/producer/av_producer.cpp index 6f28d714e3..35a37c2b6b 100644 --- a/src/modules/ffmpeg/producer/av_producer.cpp +++ b/src/modules/ffmpeg/producer/av_producer.cpp @@ -542,6 +542,7 @@ struct AVProducer::Impl if (buffer_eof_) { if (loop_) { + // TODO (fix): Don't loop if too short, e.g. image. frame = Frame{}; seek_internal(start_); } else { @@ -648,7 +649,7 @@ struct AVProducer::Impl update_state(); }; - std::lock_guard lock(mutex_); + boost::lock_guard lock(mutex_); if (!buffer_.empty() && (frame_flush_ || !frame_)) { auto frame = core::draw_frame(make_frame(this, *frame_factory_, buffer_[0].video, buffer_[0].audio)); @@ -667,7 +668,7 @@ struct AVProducer::Impl update_state(); }; - std::lock_guard lock(mutex_); + boost::lock_guard lock(mutex_); if (buffer_.empty() || (frame_flush_ && buffer_.size() < 4) || (prerolling_ && buffer_.size() < buffer_capacity_ / 4)) { if (buffer_eof_) { @@ -887,7 +888,6 @@ struct AVProducer::Impl // TODO (fix) is this always best? frame->pts = frame->best_effort_timestamp; - // TODO (fix) is this always best? auto duration_pts = frame->pkt_duration; if (duration_pts <= 0) {