X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=50f401fb75fac7d3164ef3c80b10a654554575ea;hb=d5085584d82c021e924cec6ce00e682a8e63d800;hp=c615f0a8963212b659b443f47ac23145365b16c1;hpb=623f3c66821d6a99bf0e683a8072b99a168f3a1c;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index c615f0a89..50f401fb7 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -32,7 +32,7 @@
 #include "image.h"
 #include "ratio.h"
 #include "resampler.h"
-#include "subtitle.h"
+#include "scaler.h"
 
 using std::list;
 using std::cout;
@@ -97,7 +97,7 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	, _audio_buffers (f->dcp_audio_channels(), 0)
 {
 	_playlist->Changed.connect (bind (&Player::playlist_changed, this));
-	_playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2));
+	_playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
 	_film->Changed.connect (bind (&Player::film_changed, this, _1));
 	set_video_container_size (_film->container()->size (_film->full_frame ()));
 }
@@ -138,7 +138,7 @@ Player::pass ()
 			continue;
 		}
 
-		if (dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
+		if (_video && dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
 			if ((*i)->video_position < earliest_t) {
 				earliest_t = (*i)->video_position;
 				earliest = *i;
@@ -146,7 +146,7 @@ Player::pass ()
 			}
 		}
 
-		if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
+		if (_audio && dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
 			if ((*i)->audio_position < earliest_t) {
 				earliest_t = (*i)->audio_position;
 				earliest = *i;
@@ -168,7 +168,7 @@ Player::pass ()
 	case VIDEO:
 		if (earliest_t > _video_position) {
 #ifdef DEBUG_PLAYER
-			cout << "no video here; emitting black frame.\n";
+			cout << "no video here; emitting black frame (earliest=" << earliest_t << ", video_position=" << _video_position << ").\n";
 #endif
 			emit_black ();
 		} else {
@@ -225,33 +225,23 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 
 	Time time = content->start() + (frame * frc.factor() * TIME_HZ / _film->dcp_video_frame_rate());
 	
-	if (_film->with_subtitles ()) {
-		shared_ptr<Subtitle> sub;
-		if (_subtitle && _subtitle->displayed_at (time - _subtitle_content_time)) {
-			sub = _subtitle->subtitle ();
-		}
-		
-		if (sub) {
-			dcpomatic::Rect const tx = subtitle_transformed_area (
-				float (image_size.width) / content->video_size().width,
-				float (image_size.height) / content->video_size().height,
-				sub->area(), _subtitle_offset, _subtitle_scale
-				);
-			
-			shared_ptr<Image> im = sub->image()->scale (tx.size(), _film->scaler(), true);
-			work_image->alpha_blend (im, tx.position());
-		}
+	if (_film->with_subtitles () && _out_subtitle.image && time >= _out_subtitle.from && time <= _out_subtitle.to) {
+		work_image->alpha_blend (_out_subtitle.image, _out_subtitle.position);
 	}
 
 	if (image_size != _video_container_size) {
 		assert (image_size.width <= _video_container_size.width);
 		assert (image_size.height <= _video_container_size.height);
-		shared_ptr<Image> im (new SimpleImage (PIX_FMT_RGB24, _video_container_size, true));
+		shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
 		im->make_black ();
-		im->copy (work_image, Position ((_video_container_size.width - image_size.width) / 2, (_video_container_size.height - image_size.height) / 2));
+		im->copy (work_image, Position<int> ((_video_container_size.width - image_size.width) / 2, (_video_container_size.height - image_size.height) / 2));
 		work_image = im;
 	}
 
+#ifdef DCPOMATIC_DEBUG
+	_last_video = piece->content;
+#endif	
+
         Video (work_image, same, time);
 	time += TIME_HZ / _film->dcp_video_frame_rate();
 
@@ -274,8 +264,10 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 	shared_ptr<AudioContent> content = dynamic_pointer_cast<AudioContent> (piece->content);
 	assert (content);
 
+	/* Resample */
 	if (content->content_audio_frame_rate() != content->output_audio_frame_rate()) {
-		audio = resampler(content)->run (audio);
+		shared_ptr<Resampler> r = resampler (content);
+		audio = r->run (audio);
 	}
 
 	/* Remap channels */
@@ -283,20 +275,43 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 	dcp_mapped->make_silent ();
 	list<pair<int, libdcp::Channel> > map = content->audio_mapping().content_to_dcp ();
 	for (list<pair<int, libdcp::Channel> >::iterator i = map.begin(); i != map.end(); ++i) {
-		dcp_mapped->accumulate_channel (audio.get(), i->first, i->second);
+		if (i->first < audio->channels() && i->second < dcp_mapped->channels()) {
+			dcp_mapped->accumulate_channel (audio.get(), i->first, i->second);
+		}
 	}
 
 	audio = dcp_mapped;
 
+	Time time = content->start() + (frame * TIME_HZ / _film->dcp_audio_frame_rate()) + (content->audio_delay() * TIME_HZ / 1000);
+
+	/* We must cut off anything that comes before the start of all time */
+	if (time < 0) {
+		int const frames = - time * _film->dcp_audio_frame_rate() / TIME_HZ;
+		if (frames >= audio->frames ()) {
+			return;
+		}
+
+		shared_ptr<AudioBuffers> trimmed (new AudioBuffers (audio->channels(), audio->frames() - frames));
+		trimmed->copy_from (audio.get(), audio->frames() - frames, frames, 0);
+
+		audio = trimmed;
+		time = 0;
+	}
+
         /* The time of this audio may indicate that some of our buffered audio is not going to
            be added to any more, so it can be emitted.
         */
 
-	Time const time = content->start() + (frame * TIME_HZ / _film->dcp_audio_frame_rate());
-
         if (time > _audio_position) {
                 /* We can emit some audio from our buffers */
                 OutputAudioFrame const N = _film->time_to_audio_frames (time - _audio_position);
+		if (N > _audio_buffers.frames()) {
+			/* We need some extra silence before whatever is in the buffers */
+			_audio_buffers.ensure_size (N);
+			_audio_buffers.move (0, N - _audio_buffers.frames(), _audio_buffers.frames ());
+			_audio_buffers.make_silent (0, _audio_buffers.frames());
+			_audio_buffers.set_frames (N);
+		}
 		assert (N <= _audio_buffers.frames());
                 shared_ptr<AudioBuffers> emit (new AudioBuffers (_audio_buffers.channels(), N));
                 emit->copy_from (&_audio_buffers, N, 0, 0);
@@ -337,7 +352,10 @@ Player::flush ()
 	
 }
 
-/** @return true on error */
+/** Seek so that the next pass() will yield (approximately) the requested frame.
+ *  Pass accurate = true to try harder to get close to the request.
+ *  @return true on error
+ */
 void
 Player::seek (Time t, bool accurate)
 {
@@ -360,11 +378,19 @@ Player::seek (Time t, bool accurate)
 		s = max (static_cast<Time> (0), s);
 		s = min (vc->length(), s);
 
+		(*i)->video_position = (*i)->audio_position = vc->start() + s;
+
 		FrameRateConversion frc (vc->video_frame_rate(), _film->dcp_video_frame_rate());
-		VideoContent::Frame f = s * vc->video_frame_rate() / (frc.factor() * TIME_HZ);
+		/* Here we are converting from time (in the DCP) to a frame number in the content.
+		   Hence we need to use the DCP's frame rate and the double/skip correction, not
+		   the source's rate.
+		*/
+		VideoContent::Frame f = s * _film->dcp_video_frame_rate() / (frc.factor() * TIME_HZ);
 		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (f, accurate);
 	}
 
+	_video_position = _audio_position = t;
+	
 	/* XXX: don't seek audio because we don't need to... */
 }
 
@@ -390,7 +416,7 @@ Player::setup_pieces ()
 			
 			fd->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3));
 			fd->Audio.connect (bind (&Player::process_audio, this, piece, _1, _2));
-			fd->Subtitle.connect (bind (&Player::process_subtitle, this, piece, _1));
+			fd->Subtitle.connect (bind (&Player::process_subtitle, this, piece, _1, _2, _3, _4));
 
 			piece->decoder = fd;
 		}
@@ -435,7 +461,7 @@ Player::setup_pieces ()
 }
 
 void
-Player::content_changed (weak_ptr<Content> w, int p)
+Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 {
 	shared_ptr<Content> c = w.lock ();
 	if (!c) {
@@ -443,12 +469,16 @@ Player::content_changed (weak_ptr<Content> w, int p)
 	}
 
 	if (
-		p == ContentProperty::START || p == ContentProperty::LENGTH ||
-		p == VideoContentProperty::VIDEO_CROP || p == VideoContentProperty::VIDEO_RATIO
+		property == ContentProperty::START || property == ContentProperty::LENGTH ||
+		property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO
 		) {
 		
 		_have_valid_pieces = false;
-		Changed ();
+		Changed (frequent);
+
+	} else if (property == SubtitleContentProperty::SUBTITLE_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE) {
+		update_subtitle ();
+		Changed (frequent);
 	}
 }
 
@@ -456,14 +486,14 @@ void
 Player::playlist_changed ()
 {
 	_have_valid_pieces = false;
-	Changed ();
+	Changed (false);
 }
 
 void
 Player::set_video_container_size (libdcp::Size s)
 {
 	_video_container_size = s;
-	_black_frame.reset (new SimpleImage (PIX_FMT_RGB24, _video_container_size, true));
+	_black_frame.reset (new Image (PIX_FMT_RGB24, _video_container_size, true));
 	_black_frame->make_black ();
 }
 
@@ -483,6 +513,10 @@ Player::resampler (shared_ptr<AudioContent> c)
 void
 Player::emit_black ()
 {
+#ifdef DCPOMATIC_DEBUG
+	_last_video.reset ();
+#endif
+	
 	/* XXX: use same here */
 	Video (_black_frame, false, _video_position);
 	_video_position += _film->video_frames_to_time (1);
@@ -507,23 +541,63 @@ Player::film_changed (Film::Property p)
 	*/
 
 	if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER) {
-		Changed ();
+		Changed (false);
 	}
 }
 
 void
-Player::process_subtitle (weak_ptr<Piece> weak_piece, shared_ptr<TimedSubtitle> sub)
+Player::process_subtitle (weak_ptr<Piece> weak_piece, shared_ptr<Image> image, dcpomatic::Rect<double> rect, Time from, Time to)
 {
-	shared_ptr<Piece> piece = weak_piece.lock ();
+	_in_subtitle.piece = weak_piece;
+	_in_subtitle.image = image;
+	_in_subtitle.rect = rect;
+	_in_subtitle.from = from;
+	_in_subtitle.to = to;
+
+	update_subtitle ();
+}
+
+void
+Player::update_subtitle ()
+{
+	shared_ptr<Piece> piece = _in_subtitle.piece.lock ();
 	if (!piece) {
 		return;
 	}
 
+	if (!_in_subtitle.image) {
+		_out_subtitle.image.reset ();
+		return;
+	}
+
 	shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (piece->content);
 	assert (sc);
 
-	_subtitle = sub;
-	_subtitle_content_time = piece->content->start ();
-	_subtitle_offset = sc->subtitle_offset ();
-	_subtitle_scale = sc->subtitle_scale ();
+	dcpomatic::Rect<double> in_rect = _in_subtitle.rect;
+	libdcp::Size scaled_size;
+
+	in_rect.y += sc->subtitle_offset ();
+
+	/* We will scale the subtitle up to fit _video_container_size, and also by the additional subtitle_scale */
+	scaled_size.width = in_rect.width * _video_container_size.width * sc->subtitle_scale ();
+	scaled_size.height = in_rect.height * _video_container_size.height * sc->subtitle_scale ();
+
+	/* Then we need a corrective translation, consisting of two parts:
+	 *
+	 * 1.  that which is the result of the scaling of the subtitle by _video_container_size; this will be
+	 *     rect.x * _video_container_size.width and rect.y * _video_container_size.height.
+	 *
+	 * 2.  that to shift the origin of the scale by subtitle_scale to the centre of the subtitle; this will be
+	 *     (width_before_subtitle_scale * (1 - subtitle_scale) / 2) and
+	 *     (height_before_subtitle_scale * (1 - subtitle_scale) / 2).
+	 *
+	 * Combining these two translations gives these expressions.
+	 */
+	
+	_out_subtitle.position.x = rint (_video_container_size.width * (in_rect.x + (in_rect.width * (1 - sc->subtitle_scale ()) / 2)));
+	_out_subtitle.position.y = rint (_video_container_size.height * (in_rect.y + (in_rect.height * (1 - sc->subtitle_scale ()) / 2)));
+	
+	_out_subtitle.image = _in_subtitle.image->scale (libdcp::Size (scaled_size.width, scaled_size.height), Scaler::from_id ("bicubic"), true);
+	_out_subtitle.from = _in_subtitle.from + piece->content->start ();
+	_out_subtitle.to = _in_subtitle.to + piece->content->start ();
 }