X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=d5a558184196100a6ebc94eb660e6b30e0b186f5;hb=4ab86ef0295bcd6bb9297996a06006f371d22bae;hp=657c1a8b4ed9e2d168a2ffdbc156b46704824545;hpb=af0edaf7dcd36c367cb585c98e8413c5347a7386;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 657c1a8b4..d5a558184 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -87,7 +87,7 @@ int const PlayerProperty::DCP_DECODE_REDUCTION = 704;
 Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
 	: _film (film)
 	, _playlist (playlist)
-	, _suspended (false)
+	, _suspended (0)
 	, _ignore_video (false)
 	, _ignore_audio (false)
 	, _ignore_text (false)
@@ -252,19 +252,17 @@ void
 Player::playlist_content_change (ChangeType type, int property, bool frequent)
 {
 	if (type == CHANGE_TYPE_PENDING) {
-		boost::mutex::scoped_lock lm (_mutex);
 		/* The player content is probably about to change, so we can't carry on
 		   until that has happened and we've rebuilt our pieces.  Stop pass()
 		   and seek() from working until then.
 		*/
-		_suspended = true;
+		++_suspended;
 	} else if (type == CHANGE_TYPE_DONE) {
 		/* A change in our content has gone through.  Re-build our pieces. */
 		setup_pieces ();
-		_suspended = false;
+		--_suspended;
 	} else if (type == CHANGE_TYPE_CANCELLED) {
-		boost::mutex::scoped_lock lm (_mutex);
-		_suspended = false;
+		--_suspended;
 	}
 
 	Change (type, property, frequent);
@@ -348,7 +346,8 @@ Player::black_player_video_frame (Eyes eyes) const
 			PresetColourConversion::all().front().conversion,
 			VIDEO_RANGE_FULL,
 			boost::weak_ptr<Content>(),
-			boost::optional<Frame>()
+			boost::optional<Frame>(),
+			false
 		)
 	);
 }
@@ -852,7 +851,8 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 			piece->content->video->colour_conversion(),
 			piece->content->video->range(),
 			piece->content,
-			video.frame
+			video.frame,
+			false
 			)
 		);
 
@@ -902,9 +902,7 @@ Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
 		if (remaining_frames == 0) {
 			return;
 		}
-		shared_ptr<AudioBuffers> cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames));
-		cut->copy_from (content_audio.audio.get(), remaining_frames, 0, 0);
-		content_audio.audio = cut;
+		content_audio.audio.reset (new AudioBuffers(content_audio.audio, remaining_frames, 0));
 	}
 
 	DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
@@ -957,8 +955,15 @@ Player::bitmap_text_start (weak_ptr<Piece> wp, weak_ptr<const TextContent> wc, C
 
 	PlayerText ps;
 	shared_ptr<Image> image = subtitle.sub.image;
+
 	/* We will scale the subtitle up to fit _video_container_size */
-	dcp::Size scaled_size (subtitle.sub.rectangle.width * _video_container_size.width, subtitle.sub.rectangle.height * _video_container_size.height);
+	int const width = subtitle.sub.rectangle.width * _video_container_size.width;
+	int const height = subtitle.sub.rectangle.height * _video_container_size.height;
+	if (width == 0 || height == 0) {
+		return;
+	}
+
+	dcp::Size scaled_size (width, height);
 	ps.bitmap.push_back (BitmapText(image->scale(scaled_size, dcp::YUV_TO_RGB_REC601, image->pixel_format(), true, _fast), subtitle.sub.rectangle));
 	DCPTime from (content_time_to_dcp (piece, subtitle.from()));
 
@@ -1190,8 +1195,7 @@ Player::discard_audio (shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTi
 	if (remaining_frames <= 0) {
 		return make_pair(shared_ptr<AudioBuffers>(), DCPTime());
 	}
-	shared_ptr<AudioBuffers> cut (new AudioBuffers (audio->channels(), remaining_frames));
-	cut->copy_from (audio.get(), remaining_frames, discard_frames, 0);
+	shared_ptr<AudioBuffers> cut (new AudioBuffers(audio, remaining_frames, discard_frames));
 	return make_pair(cut, time + discard_time);
 }