X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=a0949f635ffeb420a3096dfb2e740d6ef98ddaff;hb=5859b758e3a6e0191ce12e77b636c7def58bbc3b;hp=ced9b95e9bcc7172f5536c6876c6bf995b8d547f;hpb=fff7a8232b18ce6191e60ba911c29b64b9063d4d;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index ced9b95e9..a0949f635 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -61,6 +61,8 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using libdcp::Size;
 
+boost::mutex FFmpegDecoder::_mutex;
+
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegContent> c, bool video, bool audio, bool subtitles, bool video_sync)
 	: Decoder (f)
 	, VideoDecoder (f)
@@ -92,10 +94,12 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegC
 
 FFmpegDecoder::~FFmpegDecoder ()
 {
+	boost::mutex::scoped_lock lm (_mutex);
+	
 	if (_audio_codec_context) {
 		avcodec_close (_audio_codec_context);
 	}
-	
+
 	if (_video_codec_context) {
 		avcodec_close (_video_codec_context);
 	}
@@ -122,7 +126,7 @@ FFmpegDecoder::setup_general ()
 		throw DecodeError (_("could not find stream information"));
 	}
 
-	/* Find video, audio and subtitle streams and choose the first of each */
+	/* Find video, audio and subtitle streams */
 
 	for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
 		AVStream* s = _format_context->streams[i];
@@ -160,6 +164,8 @@ FFmpegDecoder::setup_general ()
 void
 FFmpegDecoder::setup_video ()
 {
+	boost::mutex::scoped_lock lm (_mutex);
+	
 	_video_codec_context = _format_context->streams[_video_stream]->codec;
 	_video_codec = avcodec_find_decoder (_video_codec_context->codec_id);
 
@@ -175,6 +181,8 @@ FFmpegDecoder::setup_video ()
 void
 FFmpegDecoder::setup_audio ()
 {
+	boost::mutex::scoped_lock lm (_mutex);
+	
 	if (!_ffmpeg_content->audio_stream ()) {
 		return;
 	}
@@ -194,6 +202,8 @@ FFmpegDecoder::setup_audio ()
 void
 FFmpegDecoder::setup_subtitle ()
 {
+	boost::mutex::scoped_lock lm (_mutex);
+	
 	if (!_ffmpeg_content->subtitle_stream() || _ffmpeg_content->subtitle_stream()->id >= int (_format_context->nb_streams)) {
 		return;
 	}
@@ -390,7 +400,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t** data, int size)
 }
 
 float
-FFmpegDecoder::frames_per_second () const
+FFmpegDecoder::video_frame_rate () const
 {
 	AVStream* s = _format_context->streams[_video_stream];
 
@@ -540,7 +550,7 @@ void
 FFmpegDecoder::out_with_sync ()
 {
 	/* Where we are in the output, in seconds */
-	double const out_pts_seconds = video_frame() / frames_per_second();
+	double const out_pts_seconds = video_frame() / video_frame_rate();
 	
 	/* Where we are in the source, in seconds */
 	double const source_pts_seconds = av_q2d (_format_context->streams[_packet.stream_index]->time_base)
@@ -557,17 +567,17 @@ FFmpegDecoder::out_with_sync ()
 	
 	/* Difference between where we are and where we should be */
 	double const delta = source_pts_seconds - _first_video.get() - out_pts_seconds;
-	double const one_frame = 1 / frames_per_second();
+	double const one_frame = 1 / video_frame_rate();
 	
 	/* Insert frames if required to get out_pts_seconds up to pts_seconds */
 	if (delta > one_frame) {
 		int const extra = rint (delta / one_frame);
 		for (int i = 0; i < extra; ++i) {
-			repeat_last_video ();
+			repeat_last_video (frame_time ());
 			_film->log()->log (
 				String::compose (
 					N_("Extra video frame inserted at %1s; source frame %2, source PTS %3 (at %4 fps)"),
-					out_pts_seconds, video_frame(), source_pts_seconds, frames_per_second()
+					out_pts_seconds, video_frame(), source_pts_seconds, video_frame_rate()
 					)
 				);
 		}
@@ -603,7 +613,7 @@ FFmpegDecoder::film_changed (Film::Property p)
 ContentVideoFrame
 FFmpegDecoder::video_length () const
 {
-	return (double(_format_context->duration) / AV_TIME_BASE) * frames_per_second();
+	return (double(_format_context->duration) / AV_TIME_BASE) * video_frame_rate();
 }
 
 double