X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=adaee931e1dcb19347672a59a575df96c8fac614;hb=081f974c2c75c306d07d5a6f5da6847826a05a9c;hp=1110b41b0bea325af567d2e7277d64e7a67d4bb0;hpb=4c0577afdbb38d4cf15208fb2d74d180f44b4609;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 1110b41b0..adaee931e 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -47,7 +47,6 @@
 #include "content_subtitle.h"
 #include "dcp_decoder.h"
 #include "image_decoder.h"
-#include "resampler.h"
 #include "compose.hpp"
 #include <dcp/reel.h>
 #include <dcp/reel_sound_asset.h>
@@ -83,7 +82,7 @@ Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
 	, _playlist (playlist)
 	, _have_valid_pieces (false)
 	, _ignore_video (false)
-	, _ignore_audio (false)
+	, _ignore_subtitle (false)
 	, _always_burn_subtitles (false)
 	, _fast (false)
 	, _play_referenced (false)
@@ -122,8 +121,8 @@ Player::setup_pieces ()
 			decoder->video->set_ignore ();
 		}
 
-		if (decoder->audio && _ignore_audio) {
-			decoder->audio->set_ignore ();
+		if (decoder->subtitle && _ignore_subtitle) {
+			decoder->subtitle->set_ignore ();
 		}
 
 		shared_ptr<DCPDecoder> dcp = dynamic_pointer_cast<DCPDecoder> (decoder);
@@ -157,22 +156,11 @@ Player::setup_pieces ()
 		}
 	}
 
-	if (!_play_referenced) {
-		BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
-			shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (i->content);
-			if (dc) {
-				if (dc->reference_video()) {
-					_no_video.push_back (DCPTimePeriod (dc->position(), dc->end()));
-				}
-				if (dc->reference_audio()) {
-					_no_audio.push_back (DCPTimePeriod (dc->position(), dc->end()));
-				}
-			}
-		}
-	}
+	_black = Empty (_playlist, bind(&Content::video, _1));
+	_silent = Empty (_playlist, bind(&Content::audio, _1));
 
-	_last_video_time = optional<DCPTime> ();
-	_last_audio_time = optional<DCPTime> ();
+	_last_video_time = DCPTime ();
+	_last_audio_time = DCPTime ();
 	_have_valid_pieces = true;
 }
 
@@ -371,8 +359,9 @@ DCPTime
 Player::resampled_audio_to_dcp (shared_ptr<const Piece> piece, Frame f) const
 {
 	/* See comment in dcp_to_content_video */
-	DCPTime const d = DCPTime::from_frames (f, _film->audio_frame_rate()) - DCPTime (piece->content->trim_start(), piece->frc);
-	return max (DCPTime (), d + piece->content->position ());
+	return DCPTime::from_frames (f, _film->audio_frame_rate())
+		- DCPTime (piece->content->trim_start(), piece->frc)
+		+ piece->content->position();
 }
 
 ContentTime
@@ -417,6 +406,12 @@ Player::set_ignore_video ()
 	_ignore_video = true;
 }
 
+void
+Player::set_ignore_subtitle ()
+{
+	_ignore_subtitle = true;
+}
+
 /** Set whether or not this player should always burn text subtitles into the image,
  *  regardless of the content settings.
  *  @param burn true to always burn subtitles, false to obey content settings.
@@ -514,53 +509,59 @@ Player::pass ()
 		setup_pieces ();
 	}
 
+	/* Find the decoder or empty which is farthest behind where we are and make it emit some data */
+
 	shared_ptr<Piece> earliest;
 	DCPTime earliest_content;
 
 	BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
 		if (!i->done) {
-			DCPTime const t = i->content->position() + DCPTime (i->decoder->position(), i->frc);
-			if (!earliest || t < earliest_content) {
+			DCPTime const t = content_time_to_dcp (i, i->decoder->position());
+			/* Given two choices at the same time, pick the one with a subtitle so we see it before
+			   the video.
+			*/
+			if (!earliest || t < earliest_content || (t == earliest_content && i->decoder->subtitle)) {
 				earliest_content = t;
 				earliest = i;
 			}
 		}
 	}
 
-	if (earliest) {
-		earliest->done = earliest->decoder->pass ();
-		if (earliest->done && earliest->content->audio) {
-			/* Flush the Player audio system for this piece */
-			BOOST_FOREACH (AudioStreamPtr i, earliest->content->audio->streams()) {
-				audio_flush (earliest, i);
-			}
-		}
-	}
-
-	if (_last_video_time) {
-		fill_video (DCPTimePeriod (_last_video_time.get(), earliest ? earliest_content : _playlist->length()));
-	} else if (_last_seek_time) {
-		fill_video (DCPTimePeriod (_last_seek_time.get(), _last_seek_time.get() + one_video_frame ()));
-	}
-
-	/* XXX: fill audio */
+	bool done = false;
 
-	if (!earliest) {
-		return true;
+	if (!_black.done() && (!earliest || _black.position() < earliest_content)) {
+		/* There is some black that must be emitted */
+		emit_video (black_player_video_frame(), _black.position());
+		_black.set_position (_black.position() + one_video_frame());
+	} else if (!_silent.done() && (!earliest || _silent.position() < earliest_content)) {
+		/* There is some silence that must be emitted */
+		DCPTimePeriod period (_silent.period_at_position());
+		if (period.duration() > one_video_frame()) {
+			period.to = period.from + one_video_frame();
+		}
+		fill_audio (period);
+		_silent.set_position (period.to);
+	} else if (_playlist->length() == DCPTime()) {
+		/* Special case of an empty Film; just give one black frame */
+		emit_video (black_player_video_frame(), DCPTime());
+	} else if (earliest) {
+		earliest->done = earliest->decoder->pass ();
+	} else {
+		done = true;
 	}
 
 	/* Emit any audio that is ready */
 
-	DCPTime pull_from = _playlist->length ();
+	DCPTime pull_to = _playlist->length ();
 	for (map<AudioStreamPtr, StreamState>::const_iterator i = _stream_states.begin(); i != _stream_states.end(); ++i) {
-		if (!i->second.piece->done && i->second.last_push_end < pull_from) {
-			pull_from = i->second.last_push_end;
+		if (!i->second.piece->done && i->second.last_push_end < pull_to) {
+			pull_to = i->second.last_push_end;
 		}
 	}
 
-	list<pair<shared_ptr<AudioBuffers>, DCPTime> > audio = _audio_merger.pull (pull_from);
+	list<pair<shared_ptr<AudioBuffers>, DCPTime> > audio = _audio_merger.pull (pull_to);
 	for (list<pair<shared_ptr<AudioBuffers>, DCPTime> >::iterator i = audio.begin(); i != audio.end(); ++i) {
-		if (_last_audio_time && i->second < _last_audio_time.get()) {
+		if (_last_audio_time && i->second < *_last_audio_time) {
 			/* There has been an accurate seek and we have received some audio before the seek time;
 			   discard it.
 			*/
@@ -571,61 +572,35 @@ Player::pass ()
 			*i = cut;
 		}
 
-		if (_last_audio_time) {
-			/* XXX: does this remain necessary? */
-			fill_audio (DCPTimePeriod (_last_audio_time.get(), i->second));
-		}
-
-		Audio (i->first, i->second);
-		_last_audio_time = i->second + DCPTime::from_frames(i->first->frames(), _film->audio_frame_rate());
+		emit_audio (i->first, i->second);
 	}
 
-	return false;
+	return done;
 }
 
 optional<PositionImage>
 Player::subtitles_for_frame (DCPTime time) const
 {
-	/* Get any subtitles */
-
-	optional<PositionImage> subtitles;
+	list<PositionImage> subtitles;
 
-	for (ActiveSubtitlesMap::const_iterator i = _active_subtitles.begin(); i != _active_subtitles.end(); ++i) {
+	BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (time, _always_burn_subtitles)) {
 
-		shared_ptr<Piece> sub_piece = i->first.lock ();
-		if (!sub_piece) {
-			continue;
-		}
+		/* Image subtitles */
+		list<PositionImage> c = transform_image_subtitles (i.image);
+		copy (c.begin(), c.end(), back_inserter (subtitles));
 
-		if (!sub_piece->content->subtitle->use() || (!_always_burn_subtitles && !sub_piece->content->subtitle->burn())) {
-			continue;
+		/* Text subtitles (rendered to an image) */
+		if (!i.text.empty ()) {
+			list<PositionImage> s = render_subtitles (i.text, i.fonts, _video_container_size, time);
+			copy (s.begin(), s.end(), back_inserter (subtitles));
 		}
+	}
 
-		BOOST_FOREACH (ActiveSubtitles j, i->second) {
-
-			if (j.from > time || (j.to && j.to.get() <= time)) {
-				continue;
-			}
-
-			list<PositionImage> sub_images;
-
-			/* Image subtitles */
-			list<PositionImage> c = transform_image_subtitles (j.subs.image);
-			copy (c.begin(), c.end(), back_inserter (sub_images));
-
-			/* Text subtitles (rendered to an image) */
-			if (!j.subs.text.empty ()) {
-				list<PositionImage> s = render_subtitles (j.subs.text, j.subs.fonts, _video_container_size, time);
-				copy (s.begin (), s.end (), back_inserter (sub_images));
-			}
-
-			if (!sub_images.empty ()) {
-				subtitles = merge (sub_images);
-			}
-		}
+	if (subtitles.empty ()) {
+		return optional<PositionImage> ();
 	}
 
-	return subtitles;
+	return merge (subtitles);
 }
 
 void
@@ -645,19 +620,30 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 	DCPTime const time = content_video_to_dcp (piece, video.frame);
 	DCPTimePeriod const period (time, time + one_video_frame());
 
-	/* Discard if it's outside the content's period or if it's before the last accurate seek */
-	if (time < piece->content->position() || time >= piece->content->end() || (_last_video_time && time < _last_video_time)) {
-		return;
-	}
-
-	/* Fill gaps caused by (the hopefully rare event of) a decoder not emitting contiguous video */
+	/* Fill gaps that we discover now that we have some video which needs to be emitted */
 
-	/* XXX: is this necessary? can it be done by the fill in pass? */
 	if (_last_video_time) {
-		fill_video (DCPTimePeriod (_last_video_time.get(), time));
+		/* XXX: this may not work for 3D */
+		DCPTime fill_from = max (*_last_video_time, piece->content->position());
+		for (DCPTime j = fill_from; j < time; j += one_video_frame()) {
+			LastVideoMap::const_iterator k = _last_video.find (wp);
+			if (k != _last_video.end ()) {
+				emit_video (k->second, j);
+			} else {
+				emit_video (black_player_video_frame(), j);
+			}
+		}
 	}
 
-	_last_video.reset (
+	/* Discard if it's outside the content's period or if it's before the last accurate seek */
+	if (
+		time < piece->content->position() ||
+		time >= piece->content->end() ||
+		(_last_video_time && time < *_last_video_time)) {
+		return;
+	}
+
+	_last_video[wp].reset (
 		new PlayerVideo (
 			video.image,
 			piece->content->video->crop (),
@@ -672,103 +658,7 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 			)
 		);
 
-	optional<PositionImage> subtitles = subtitles_for_frame (time);
-	if (subtitles) {
-		_last_video->set_subtitle (subtitles.get ());
-	}
-
-	Video (_last_video, time);
-
-	_last_video_time = time + one_video_frame ();
-
-	/* Clear any finished _active_subtitles */
-	ActiveSubtitlesMap updated;
-	for (ActiveSubtitlesMap::const_iterator i = _active_subtitles.begin(); i != _active_subtitles.end(); ++i) {
-		list<ActiveSubtitles> as;
-		BOOST_FOREACH (ActiveSubtitles j, i->second) {
-			if (!j.to || j.to.get() >= time) {
-				as.push_back (j);
-			}
-		}
-		if (!as.empty ()) {
-			updated[i->first] = as;
-		}
-	}
-	_active_subtitles = updated;
-}
-
-void
-Player::audio_flush (shared_ptr<Piece> piece, AudioStreamPtr stream)
-{
-	shared_ptr<AudioContent> content = piece->content->audio;
-	DCPOMATIC_ASSERT (content);
-
-	shared_ptr<Resampler> r = resampler (content, stream, false);
-	if (!r) {
-		return;
-	}
-
-	pair<shared_ptr<const AudioBuffers>, Frame> ro = r->flush ();
-	if (ro.first->frames() == 0) {
-		return;
-	}
-
-	ContentAudio content_audio;
-	content_audio.audio = ro.first;
-	content_audio.frame = ro.second;
-
-	/* Compute time in the DCP */
-	DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000.0);
-
-	audio_transform (content, stream, content_audio, time);
-}
-
-/** Do our common processing on some audio */
-void
-Player::audio_transform (shared_ptr<AudioContent> content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time)
-{
-	DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
-
-	/* Gain */
-
-	if (content->gain() != 0) {
-		shared_ptr<AudioBuffers> gain (new AudioBuffers (content_audio.audio));
-		gain->apply_gain (content->gain ());
-		content_audio.audio = gain;
-	}
-
-	/* Remap */
-
-	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), content_audio.audio->frames()));
-	dcp_mapped->make_silent ();
-
-	AudioMapping map = stream->mapping ();
-	for (int i = 0; i < map.input_channels(); ++i) {
-		for (int j = 0; j < dcp_mapped->channels(); ++j) {
-			if (map.get (i, static_cast<dcp::Channel> (j)) > 0) {
-				dcp_mapped->accumulate_channel (
-					content_audio.audio.get(),
-					i,
-					static_cast<dcp::Channel> (j),
-					map.get (i, static_cast<dcp::Channel> (j))
-					);
-			}
-		}
-	}
-
-	content_audio.audio = dcp_mapped;
-
-	/* Process */
-
-	if (_audio_processor) {
-		content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ());
-	}
-
-	/* Push */
-
-	_audio_merger.push (content_audio.audio, time);
-	DCPOMATIC_ASSERT (_stream_states.find (stream) != _stream_states.end ());
-	_stream_states[stream].last_push_end = time + DCPTime::from_frames (content_audio.audio->frames(), _film->audio_frame_rate());
+	emit_video (_last_video[wp], time);
 }
 
 void
@@ -784,19 +674,8 @@ Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
 	shared_ptr<AudioContent> content = piece->content->audio;
 	DCPOMATIC_ASSERT (content);
 
-	/* Resample */
-	if (stream->frame_rate() != content->resampled_frame_rate()) {
-		shared_ptr<Resampler> r = resampler (content, stream, true);
-		pair<shared_ptr<const AudioBuffers>, Frame> ro = r->run (content_audio.audio, content_audio.frame);
-		if (ro.first->frames() == 0) {
-			return;
-		}
-		content_audio.audio = ro.first;
-		content_audio.frame = ro.second;
-	}
-
 	/* Compute time in the DCP */
-	DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000.0);
+	DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame);
 	/* And the end of this block in the DCP */
 	DCPTime end = time + DCPTime::from_frames(content_audio.audio->frames(), content->resampled_frame_rate());
 
@@ -814,13 +693,39 @@ Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
 		return;
 	} else if (end > piece->content->end()) {
 		Frame const remaining_frames = DCPTime(piece->content->end() - time).frames_round(_film->audio_frame_rate());
-		DCPOMATIC_ASSERT (remaining_frames > 0);
+		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;
 	}
 
-	audio_transform (content, stream, content_audio, time);
+	DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
+
+	/* Gain */
+
+	if (content->gain() != 0) {
+		shared_ptr<AudioBuffers> gain (new AudioBuffers (content_audio.audio));
+		gain->apply_gain (content->gain ());
+		content_audio.audio = gain;
+	}
+
+	/* Remap */
+
+	content_audio.audio = remap (content_audio.audio, _film->audio_channels(), stream->mapping());
+
+	/* Process */
+
+	if (_audio_processor) {
+		content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ());
+	}
+
+	/* Push */
+
+	_audio_merger.push (content_audio.audio, time);
+	DCPOMATIC_ASSERT (_stream_states.find (stream) != _stream_states.end ());
+	_stream_states[stream].last_push_end = time + DCPTime::from_frames (content_audio.audio->frames(), _film->audio_frame_rate());
 }
 
 void
@@ -847,10 +752,7 @@ Player::image_subtitle_start (weak_ptr<Piece> wp, ContentImageSubtitle subtitle)
 	ps.image.push_back (subtitle.sub);
 	DCPTime from (content_time_to_dcp (piece, subtitle.from()));
 
-	if (_active_subtitles.find(wp) == _active_subtitles.end()) {
-		_active_subtitles[wp] = list<ActiveSubtitles>();
-	}
-	_active_subtitles[wp].push_back (ActiveSubtitles (ps, from));
+	_active_subtitles.add_from (wp, ps, from);
 }
 
 void
@@ -889,16 +791,13 @@ Player::text_subtitle_start (weak_ptr<Piece> wp, ContentTextSubtitle subtitle)
 		ps.add_fonts (piece->content->subtitle->fonts ());
 	}
 
-	if (_active_subtitles.find(wp) == _active_subtitles.end()) {
-		_active_subtitles[wp] = list<ActiveSubtitles> ();
-	}
-	_active_subtitles[wp].push_back (ActiveSubtitles (ps, from));
+	_active_subtitles.add_from (wp, ps, from);
 }
 
 void
 Player::subtitle_stop (weak_ptr<Piece> wp, ContentTime to)
 {
-	if (_active_subtitles.find (wp) == _active_subtitles.end ()) {
+	if (!_active_subtitles.have (wp)) {
 		return;
 	}
 
@@ -909,14 +808,10 @@ Player::subtitle_stop (weak_ptr<Piece> wp, ContentTime to)
 
 	DCPTime const dcp_to = content_time_to_dcp (piece, to);
 
-	if (piece->content->subtitle->use() && !_always_burn_subtitles && !piece->content->subtitle->burn()) {
-		Subtitle (_active_subtitles[wp].back().subs, DCPTimePeriod (_active_subtitles[wp].back().from, dcp_to));
-	}
-
-	_active_subtitles[wp].back().to = dcp_to;
+	pair<PlayerSubtitles, DCPTime> from = _active_subtitles.add_to (wp, dcp_to);
 
-	BOOST_FOREACH (SubtitleString& i, _active_subtitles[wp].back().subs.text) {
-		i.set_out (dcp::Time(dcp_to.seconds(), 1000));
+	if (piece->content->subtitle->use() && !_always_burn_subtitles && !piece->content->subtitle->burn()) {
+		Subtitle (from.first, DCPTimePeriod (from.second, dcp_to));
 	}
 }
 
@@ -927,11 +822,6 @@ Player::seek (DCPTime time, bool accurate)
 		_audio_processor->flush ();
 	}
 
-	for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
-		i->second->flush ();
-		i->second->reset ();
-	}
-
 	_audio_merger.clear ();
 	_active_subtitles.clear ();
 
@@ -954,76 +844,58 @@ Player::seek (DCPTime time, bool accurate)
 		_last_video_time = time;
 		_last_audio_time = time;
 	} else {
-		_last_video_time = optional<DCPTime> ();
-		_last_audio_time = optional<DCPTime> ();
+		_last_video_time = optional<DCPTime>();
+		_last_audio_time = optional<DCPTime>();
 	}
 
-	_last_seek_time = time;
+	_black.set_position (time);
+	_silent.set_position (time);
+
+	_last_video.clear ();
 }
 
-shared_ptr<Resampler>
-Player::resampler (shared_ptr<const AudioContent> content, AudioStreamPtr stream, bool create)
+void
+Player::emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
 {
-	ResamplerMap::const_iterator i = _resamplers.find (make_pair (content, stream));
-	if (i != _resamplers.end ()) {
-		return i->second;
-	}
-
-	if (!create) {
-		return shared_ptr<Resampler> ();
+	optional<PositionImage> subtitles = subtitles_for_frame (time);
+	if (subtitles) {
+		pv->set_subtitle (subtitles.get ());
 	}
 
-	LOG_GENERAL (
-		"Creating new resampler from %1 to %2 with %3 channels",
-		stream->frame_rate(),
-		content->resampled_frame_rate(),
-		stream->channels()
-		);
-
-	shared_ptr<Resampler> r (
-		new Resampler (stream->frame_rate(), content->resampled_frame_rate(), stream->channels())
-		);
+	Video (pv, time);
 
-	_resamplers[make_pair(content, stream)] = r;
-	return r;
+	if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) {
+		_last_video_time = time + one_video_frame();
+		_active_subtitles.clear_before (time);
+	}
 }
 
 void
-Player::fill_video (DCPTimePeriod period)
+Player::emit_audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
-	/* XXX: this may not work for 3D */
-	BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_video)) {
-		for (DCPTime j = i.from; j < i.to; j += one_video_frame()) {
-			if (_playlist->video_content_at(j) && _last_video) {
-				Video (shared_ptr<PlayerVideo> (new PlayerVideo (*_last_video)), j);
-			} else {
-				shared_ptr<PlayerVideo> black = black_player_video_frame ();
-				optional<PositionImage> subtitles = subtitles_for_frame (j);
-				if (subtitles) {
-					black->set_subtitle (subtitles.get ());
-				}
-				Video (black, j);
-			}
-			_last_video_time = j;
-		}
-	}
+	Audio (data, time);
+	_last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate());
 }
 
 void
 Player::fill_audio (DCPTimePeriod period)
 {
-	BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_audio)) {
-		DCPTime t = i.from;
-		while (t < i.to) {
-			DCPTime block = min (DCPTime::from_seconds (0.5), i.to - t);
-			Frame const samples = block.frames_round(_film->audio_frame_rate());
-			if (samples) {
-				shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), samples));
-				silence->make_silent ();
-				Audio (silence, t);
-			}
-			t += block;
+	if (period.from == period.to) {
+		return;
+	}
+
+	DCPOMATIC_ASSERT (period.from < period.to);
+
+	DCPTime t = period.from;
+	while (t < period.to) {
+		DCPTime block = min (DCPTime::from_seconds (0.5), period.to - t);
+		Frame const samples = block.frames_round(_film->audio_frame_rate());
+		if (samples) {
+			shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), samples));
+			silence->make_silent ();
+			emit_audio (silence, t);
 		}
+		t += block;
 	}
 }