X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=9f859969341fa65a1eacc22d0c3da9b7002387c0;hb=ea6240f349a27e1e8f4f03ee69640e3a2939d958;hp=978db035fe796e271fef8578753e44535b8654c1;hpb=98060a4e6f02b418f30b4b736e5880a357454c40;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 978db035f..9f8599693 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -144,7 +144,6 @@ Player::pass ()
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
-		_have_valid_pieces = true;
 	}
 
 	Time earliest_t = TIME_MAX;
@@ -273,23 +272,32 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 	Time const time = content->position() + relative_time + extra - content->trim_start ();
 	float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio();
 	libdcp::Size const image_size = fit_ratio_within (ratio, _video_container_size);
-	
-	shared_ptr<Image> work_image = image->crop_scale_window (content->crop(), image_size, _video_container_size, _film->scaler(), PIX_FMT_RGB24, false);
 
-	Position<int> const container_offset (
-		(_video_container_size.width - image_size.width) / 2,
-		(_video_container_size.height - image_size.width) / 2
+	shared_ptr<PlayerImage> pi (
+		new PlayerImage (
+			image,
+			content->crop(),
+			image_size,
+			_video_container_size,
+			_film->scaler()
+			)
 		);
-
+	
 	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 + container_offset);
-	}
 
+		Position<int> const container_offset (
+			(_video_container_size.width - image_size.width) / 2,
+			(_video_container_size.height - image_size.width) / 2
+			);
+
+		pi->set_subtitle (_out_subtitle.image, _out_subtitle.position + container_offset);
+	}
+					    
 #ifdef DCPOMATIC_DEBUG
 	_last_video = piece->content;
 #endif
 
-	Video (work_image, eyes, content->colour_conversion(), same, time);
+	Video (pi, eyes, content->colour_conversion(), same, time);
 
 	_last_emit_was_black = false;
 	_video_position = piece->video_position = (time + TIME_HZ / _film->video_frame_rate());
@@ -336,10 +344,18 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 	/* Remap channels */
 	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames()));
 	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) {
-		if (i->first < audio->channels() && i->second < dcp_mapped->channels()) {
-			dcp_mapped->accumulate_channel (audio.get(), i->first, i->second);
+
+	AudioMapping map = content->audio_mapping ();
+	for (int i = 0; i < map.content_channels(); ++i) {
+		for (int j = 0; j < _film->audio_channels(); ++j) {
+			if (map.get (i, static_cast<libdcp::Channel> (j)) > 0) {
+				dcp_mapped->accumulate_channel (
+					audio.get(),
+					i,
+					static_cast<libdcp::Channel> (j),
+					map.get (i, static_cast<libdcp::Channel> (j))
+					);
+			}
 		}
 	}
 
@@ -367,16 +383,16 @@ void
 Player::flush ()
 {
 	TimedAudioBuffers<Time> tb = _audio_merger.flush ();
-	if (tb.audio) {
+	if (_audio && tb.audio) {
 		Audio (tb.audio, tb.time);
 		_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
 	}
 
-	while (_video_position < _audio_position) {
+	while (_video && _video_position < _audio_position) {
 		emit_black ();
 	}
 
-	while (_audio_position < _video_position) {
+	while (_audio && _audio_position < _video_position) {
 		emit_silence (_film->time_to_audio_frames (_video_position - _audio_position));
 	}
 	
@@ -391,7 +407,6 @@ Player::seek (Time t, bool accurate)
 {
 	if (!_have_valid_pieces) {
 		setup_pieces ();
-		_have_valid_pieces = true;
 	}
 
 	if (_pieces.empty ()) {
@@ -483,6 +498,8 @@ Player::setup_pieces ()
 
 		_pieces.push_back (piece);
 	}
+
+	_have_valid_pieces = true;
 }
 
 void
@@ -495,7 +512,8 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 
 	if (
 		property == ContentProperty::POSITION || property == ContentProperty::LENGTH ||
-		property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END
+		property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END ||
+		property == VideoContentProperty::VIDEO_FRAME_TYPE 
 		) {
 		
 		_have_valid_pieces = false;
@@ -507,8 +525,8 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 		Changed (frequent);
 
 	} else if (
-		property == VideoContentProperty::VIDEO_FRAME_TYPE || property == VideoContentProperty::VIDEO_CROP ||
-		property == VideoContentProperty::VIDEO_RATIO
+		property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO ||
+		property == VideoContentProperty::VIDEO_FRAME_RATE
 		) {
 		
 		Changed (frequent);
@@ -530,8 +548,19 @@ void
 Player::set_video_container_size (libdcp::Size s)
 {
 	_video_container_size = s;
-	_black_frame.reset (new Image (PIX_FMT_RGB24, _video_container_size, true));
-	_black_frame->make_black ();
+
+	shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
+	im->make_black ();
+	
+	_black_frame.reset (
+		new PlayerImage (
+			im,
+			Crop(),
+			_video_container_size,
+			_video_container_size,
+			Scaler::from_id ("bicubic")
+			)
+		);
 }
 
 shared_ptr<Resampler>
@@ -591,7 +620,7 @@ Player::film_changed (Film::Property p)
 	   last time we were run.
 	*/
 
-	if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER) {
+	if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) {
 		Changed (false);
 	}
 }
@@ -664,7 +693,7 @@ Player::update_subtitle ()
 bool
 Player::repeat_last_video ()
 {
-	if (!_last_incoming_video.image) {
+	if (!_last_incoming_video.image || !_have_valid_pieces) {
 		return false;
 	}
 
@@ -679,3 +708,40 @@ Player::repeat_last_video ()
 
 	return true;
 }
+
+PlayerImage::PlayerImage (
+	shared_ptr<const Image> in,
+	Crop crop,
+	libdcp::Size inter_size,
+	libdcp::Size out_size,
+	Scaler const * scaler
+	)
+	: _in (in)
+	, _crop (crop)
+	, _inter_size (inter_size)
+	, _out_size (out_size)
+	, _scaler (scaler)
+{
+
+}
+
+void
+PlayerImage::set_subtitle (shared_ptr<const Image> image, Position<int> pos)
+{
+	_subtitle_image = image;
+	_subtitle_position = pos;
+}
+
+shared_ptr<Image>
+PlayerImage::image ()
+{
+	shared_ptr<Image> out = _in->crop_scale_window (_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, false);
+
+	Position<int> const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2);
+
+	if (_subtitle_image) {
+		out->alpha_blend (_subtitle_image, _subtitle_position);
+	}
+
+	return out;
+}