X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=ecf37b57662b6b89c198a15f3035626ba3b5dce7;hb=88bb39c23e73041cdd7178414473a2223be277fa;hp=29523b1eec108e7b1dadd6118735bdc6307ddc65;hpb=276a8f49c94cc80a7b29d5ecd8c7584e7ddcd87c;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 29523b1ee..ecf37b576 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -46,6 +46,7 @@
 #include "dcp_subtitle_decoder.h"
 #include "audio_processor.h"
 #include "playlist.h"
+#include "referenced_reel_asset.h"
 #include <dcp/reel.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel_subtitle_asset.h>
@@ -57,7 +58,7 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
 using std::list;
 using std::cout;
@@ -73,6 +74,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using boost::scoped_ptr;
 
 Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
 	: _film (film)
@@ -107,30 +109,6 @@ Player::setup_pieces ()
 		shared_ptr<Decoder> decoder;
 		optional<FrameRateChange> frc;
 
-		/* Work out a FrameRateChange for the best overlap video for this content, in case we need it below */
-		DCPTime best_overlap_t;
-		shared_ptr<VideoContent> best_overlap;
-		BOOST_FOREACH (shared_ptr<Content> j, _playlist->content ()) {
-			shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (j);
-			if (!vc) {
-				continue;
-			}
-
-			DCPTime const overlap = max (vc->position(), i->position()) - min (vc->end(), i->end());
-			if (overlap > best_overlap_t) {
-				best_overlap = vc;
-				best_overlap_t = overlap;
-			}
-		}
-
-		optional<FrameRateChange> best_overlap_frc;
-		if (best_overlap) {
-			best_overlap_frc = FrameRateChange (best_overlap->video_frame_rate(), _film->video_frame_rate ());
-		} else {
-			/* No video overlap; e.g. if the DCP is just audio */
-			best_overlap_frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ());
-		}
-
 		/* FFmpeg */
 		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (i);
 		if (fc) {
@@ -166,21 +144,48 @@ Player::setup_pieces ()
 		shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (i);
 		if (sc) {
 			decoder.reset (new SndfileDecoder (sc, _fast));
-			frc = best_overlap_frc;
+
+			/* Work out a FrameRateChange for the best overlap video for this content */
+			DCPTime best_overlap_t;
+			shared_ptr<VideoContent> best_overlap;
+			BOOST_FOREACH (shared_ptr<Content> j, _playlist->content ()) {
+				shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (j);
+				if (!vc) {
+					continue;
+				}
+
+				DCPTime const overlap = min (vc->end(), i->end()) - max (vc->position(), i->position());
+				if (overlap > best_overlap_t) {
+					best_overlap = vc;
+					best_overlap_t = overlap;
+				}
+			}
+
+			if (best_overlap) {
+				frc = FrameRateChange (best_overlap->video_frame_rate(), _film->video_frame_rate ());
+			} else {
+				/* No video overlap; e.g. if the DCP is just audio */
+				frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ());
+			}
 		}
 
+		/* It's questionable whether subtitle content should have a video frame rate; perhaps
+		   it should be assumed that any subtitle content has been prepared at the same rate
+		   as simultaneous video content (like we do with audio).
+		*/
+
 		/* SubRipContent */
 		shared_ptr<const SubRipContent> rc = dynamic_pointer_cast<const SubRipContent> (i);
 		if (rc) {
 			decoder.reset (new SubRipDecoder (rc));
-			frc = best_overlap_frc;
+			frc = FrameRateChange (rc->subtitle_video_frame_rate(), _film->video_frame_rate());
 		}
 
 		/* DCPSubtitleContent */
 		shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (i);
 		if (dsc) {
 			decoder.reset (new DCPSubtitleDecoder (dsc));
-			frc = best_overlap_frc;
+			frc = FrameRateChange (dsc->subtitle_video_frame_rate(), _film->video_frame_rate());
 		}
 
 		shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> (decoder);
@@ -214,7 +219,10 @@ Player::playlist_content_changed (weak_ptr<Content> w, int property, bool freque
 		property == ContentProperty::TRIM_END ||
 		property == ContentProperty::PATH ||
 		property == VideoContentProperty::VIDEO_FRAME_TYPE ||
-		property == DCPContentProperty::CAN_BE_PLAYED
+		property == DCPContentProperty::CAN_BE_PLAYED ||
+		property == SubRipContentProperty::SUBTITLE_COLOUR ||
+		property == SubRipContentProperty::SUBTITLE_OUTLINE ||
+		property == SubRipContentProperty::SUBTITLE_OUTLINE_COLOUR
 		) {
 
 		_have_valid_pieces = false;
@@ -244,7 +252,7 @@ Player::set_video_container_size (dcp::Size s)
 {
 	_video_container_size = s;
 
-	_black_image.reset (new Image (PIX_FMT_RGB24, _video_container_size, true));
+	_black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true));
 	_black_image->make_black ();
 }
 
@@ -353,7 +361,7 @@ Player::get_video (DCPTime time, bool accurate)
 
 	/* Find subtitles for possible burn-in */
 
-	PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false, true);
+	PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false, true, accurate);
 
 	list<PositionImage> sub_images;
 
@@ -376,7 +384,7 @@ Player::get_video (DCPTime time, bool accurate)
 
 	list<shared_ptr<Piece> > ov = overlaps<VideoContent> (
 		time,
-		time + DCPTime::from_frames (1, _film->video_frame_rate ()) - DCPTime::delta()
+		time + DCPTime::from_frames (1, _film->video_frame_rate ())
 		);
 
 	list<shared_ptr<PlayerVideo> > pvf;
@@ -615,7 +623,7 @@ Player::content_subtitle_to_dcp (shared_ptr<const Piece> piece, ContentTime t) c
  *  _always_burn_subtitles is true; in this case, all subtitles will be returned.
  */
 PlayerSubtitles
-Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt)
+Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, bool accurate)
 {
 	list<shared_ptr<Piece> > subs = overlaps<SubtitleContent> (time, time + length);
 
@@ -637,7 +645,7 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt)
 		/* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */
 		ContentTime const to = from + ContentTime::from_frames (1, _film->video_frame_rate ());
 
-		list<ContentImageSubtitle> image = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to), starting);
+		list<ContentImageSubtitle> image = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to), starting, accurate);
 		for (list<ContentImageSubtitle>::iterator i = image.begin(); i != image.end(); ++i) {
 
 			/* Apply content's subtitle offsets */
@@ -655,7 +663,7 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt)
 			ps.image.push_back (i->sub);
 		}
 
-		list<ContentTextSubtitle> text = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to), starting);
+		list<ContentTextSubtitle> text = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to), starting, accurate);
 		BOOST_FOREACH (ContentTextSubtitle& ts, text) {
 			BOOST_FOREACH (dcp::SubtitleString s, ts.subs) {
 				s.set_h_position (s.h_position() + subtitle_content->subtitle_x_offset ());
@@ -667,8 +675,8 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt)
 				if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) {
 					s.set_aspect_adjust (xs / ys);
 				}
-				s.set_in (dcp::Time(content_subtitle_to_dcp (*j, ts.period().from).seconds()));
-				s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds()));
+				s.set_in (dcp::Time(content_subtitle_to_dcp (*j, ts.period().from).seconds(), 1000));
+				s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds(), 1000));
 				ps.text.push_back (s);
 				ps.add_fonts (subtitle_content->fonts ());
 			}
@@ -738,26 +746,57 @@ Player::set_play_referenced ()
 	_have_valid_pieces = false;
 }
 
-list<shared_ptr<dcp::ReelAsset> >
+list<ReferencedReelAsset>
 Player::get_reel_assets ()
 {
-	list<shared_ptr<dcp::ReelAsset> > a;
+	list<ReferencedReelAsset> a;
 
 	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
 		shared_ptr<DCPContent> j = dynamic_pointer_cast<DCPContent> (i);
 		if (!j) {
 			continue;
 		}
-		/* XXX: hack hack hack */
-		DCPDecoder decoder (j, false);
-		if (j->reference_video ()) {
-			a.push_back (decoder.reels().front()->main_picture ());
-		}
-		if (j->reference_audio ()) {
-			a.push_back (decoder.reels().front()->main_sound ());
+
+		scoped_ptr<DCPDecoder> decoder;
+		try {
+			decoder.reset (new DCPDecoder (j, false));
+		} catch (...) {
+			return a;
 		}
-		if (j->reference_subtitle ()) {
-			a.push_back (decoder.reels().front()->main_subtitle ());
+
+		int64_t offset = 0;
+		BOOST_FOREACH (shared_ptr<dcp::Reel> k, decoder->reels()) {
+			DCPTime const from = i->position() + DCPTime::from_frames (offset, _film->video_frame_rate());
+			if (j->reference_video ()) {
+				a.push_back (
+					ReferencedReelAsset (
+						k->main_picture (),
+						DCPTimePeriod (from, from + DCPTime::from_frames (k->main_picture()->duration(), _film->video_frame_rate()))
+						)
+					);
+			}
+
+			if (j->reference_audio ()) {
+				a.push_back (
+					ReferencedReelAsset (
+						k->main_sound (),
+						DCPTimePeriod (from, from + DCPTime::from_frames (k->main_sound()->duration(), _film->video_frame_rate()))
+						)
+					);
+			}
+
+			if (j->reference_subtitle ()) {
+				DCPOMATIC_ASSERT (k->main_subtitle ());
+				a.push_back (
+					ReferencedReelAsset (
+						k->main_subtitle (),
+						DCPTimePeriod (from, from + DCPTime::from_frames (k->main_subtitle()->duration(), _film->video_frame_rate()))
+						)
+					);
+			}
+
+			/* Assume that main picture duration is the length of the reel */
+			offset += k->main_picture()->duration ();
 		}
 	}