X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=304f8c723d86daa5b6059b7496c84b4f978b59b2;hb=915cecb8f2b4bb251e72bbcd6c41144b73f8bfd7;hp=62527e3ebbf3b60408bd2cc967ffb568f529ddf8;hpb=df48c75c38dd788835a93540aea243a2dac4bb10;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 62527e3eb..304f8c723 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.
 
@@ -900,9 +900,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);
@@ -955,8 +953,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()));
 
@@ -1188,8 +1193,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);
 }