X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=a2bec83bb3266948802c14f4c9fe4436e3b4e649;hb=931fa4ef2dbfb7c9f726c4dd41eea79621b49906;hp=72745f2208435e31e69964e8a16eba1c948d756d;hpb=1432280f6c13d507690daf286e13cf850e612914;p=dcpomatic.git

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 72745f220..a2bec83bb 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -26,9 +26,13 @@
 #include "video_content.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
-#include "imagemagick_decoder.h"
-#include "imagemagick_content.h"
+#include "image_decoder.h"
+#include "content_factory.h"
 #include "job.h"
+#include "config.h"
+#include "util.h"
+
+#include "i18n.h"
 
 using std::list;
 using std::cout;
@@ -36,383 +40,359 @@ using std::vector;
 using std::min;
 using std::max;
 using std::string;
+using std::stringstream;
+using std::pair;
+using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
 
 Playlist::Playlist ()
-	: _audio_from (AUDIO_FFMPEG)
-	, _loop (1)
+	: _sequence_video (true)
+	, _sequencing_video (false)
 {
 
 }
 
-Playlist::Playlist (shared_ptr<const Playlist> other)
-	: _audio_from (other->_audio_from)
-	, _loop (other->_loop)
+Playlist::~Playlist ()
 {
-	for (ContentList::const_iterator i = other->_content.begin(); i != other->_content.end(); ++i) {
-		_content.push_back ((*i)->clone ());
-	}
-
-	setup ();
+	_content.clear ();
+	reconnect ();
 }
 
 void
-Playlist::setup ()
+Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
 {
-	_audio_from = AUDIO_FFMPEG;
-
-	_video.clear ();
-	_audio.clear ();
-
-	for (list<boost::signals2::connection>::iterator i = _content_connections.begin(); i != _content_connections.end(); ++i) {
-		i->disconnect ();
+	if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) {
+		maybe_sequence_video ();
 	}
 	
-	_content_connections.clear ();
-
-	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-
-		/* Video is video */
-		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
-		if (vc) {
-			_video.push_back (vc);
-		}
-
-		/* FFmpegContent is audio if we are doing AUDIO_FFMPEG */
-		shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
-		if (fc && _audio_from == AUDIO_FFMPEG) {
-			_audio.push_back (fc);
-		}
-
-		/* SndfileContent trumps FFmpegContent for audio */
-		shared_ptr<SndfileContent> sc = dynamic_pointer_cast<SndfileContent> (*i);
-		if (sc) {
-			if (_audio_from == AUDIO_FFMPEG) {
-				/* This is our fist SndfileContent; clear any FFmpegContent and
-				   say that we are using Sndfile.
-				*/
-				_audio.clear ();
-				_audio_from = AUDIO_SNDFILE;
-			}
-			
-			_audio.push_back (sc);
-		}
-
-		_content_connections.push_back ((*i)->Changed.connect (bind (&Playlist::content_changed, this, _1, _2)));
-	}
+	ContentChanged (content, property, frequent);
 }
 
-/** @return Length of our audio */
-ContentAudioFrame
-Playlist::audio_length () const
+void
+Playlist::maybe_sequence_video ()
 {
-	ContentAudioFrame len = 0;
-
-	switch (_audio_from) {
-	case AUDIO_FFMPEG:
-		/* FFmpeg content is sequential */
-		for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-			len += (*i)->audio_length ();
+	if (!_sequence_video || _sequencing_video) {
+		return;
+	}
+	
+	_sequencing_video = true;
+	
+	ContentList cl = _content;
+	Time next_left = 0;
+	Time next_right = 0;
+	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
+		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
+		if (!vc) {
+			continue;
 		}
-		break;
-	case AUDIO_SNDFILE:
-		/* Sndfile content is simultaneous */
-		for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-			len = max (len, (*i)->audio_length ());
+	
+		if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+			vc->set_position (next_right);
+			next_right = vc->end() + 1;
+		} else {
+			vc->set_position (next_left);
+			next_left = vc->end() + 1;
 		}
-		break;
 	}
 
-	return len * _loop;
+	/* This won't change order, so it does not need a sort */
+	
+	_sequencing_video = false;
 }
 
-/** @return number of audio channels */
-int
-Playlist::audio_channels () const
+string
+Playlist::video_identifier () const
 {
-	int channels = 0;
+	string t;
 	
-	switch (_audio_from) {
-	case AUDIO_FFMPEG:
-		/* FFmpeg audio is sequential, so use the maximum channel count */
-		for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-			channels = max (channels, (*i)->audio_channels ());
-		}
-		break;
-	case AUDIO_SNDFILE:
-		/* Sndfile audio is simultaneous, so it's the sum of the channel counts */
-		for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-			channels += (*i)->audio_channels ();
+	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
+		shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
+		if (vc) {
+			t += vc->identifier ();
 		}
-		break;
 	}
 
-	return channels;
+	return md5_digest (t.c_str(), t.length());
 }
 
-int
-Playlist::audio_frame_rate () const
+/** @param node <Playlist> node */
+void
+Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version, list<string>& notes)
 {
-	if (_audio.empty ()) {
-		return 0;
+	list<cxml::NodePtr> c = node->node_children ("Content");
+	for (list<cxml::NodePtr>::iterator i = c.begin(); i != c.end(); ++i) {
+		_content.push_back (content_factory (film, *i, version, notes));
 	}
 
-	/* XXX: assuming that all content has the same rate */
-	return _audio.front()->audio_frame_rate ();
+	sort (_content.begin(), _content.end(), ContentSorter ());
+
+	reconnect ();
 }
 
-float
-Playlist::video_frame_rate () const
+/** @param node <Playlist> node */
+void
+Playlist::as_xml (xmlpp::Node* node)
 {
-	if (_video.empty ()) {
-		return 0;
+	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
+		(*i)->as_xml (node->add_child ("Content"));
 	}
-	
-	/* XXX: assuming all the same */
-	return _video.front()->video_frame_rate ();
 }
 
-libdcp::Size
-Playlist::video_size () const
+void
+Playlist::add (shared_ptr<Content> c)
+{
+	_content.push_back (c);
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	reconnect ();
+	Changed ();
+}
+
+void
+Playlist::remove (shared_ptr<Content> c)
 {
-	if (_video.empty ()) {
-		return libdcp::Size ();
+	ContentList::iterator i = _content.begin ();
+	while (i != _content.end() && *i != c) {
+		++i;
+	}
+	
+	if (i != _content.end ()) {
+		_content.erase (i);
+		Changed ();
 	}
 
-	/* XXX: assuming all the same */
-	return _video.front()->video_size ();
+	/* This won't change order, so it does not need a sort */
 }
 
-ContentVideoFrame
-Playlist::video_length () const
+void
+Playlist::remove (ContentList c)
 {
-	ContentVideoFrame len = 0;
-	for (list<shared_ptr<const VideoContent> >::const_iterator i = _video.begin(); i != _video.end(); ++i) {
-		len += (*i)->video_length ();
+	for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+		ContentList::iterator j = _content.begin ();
+		while (j != _content.end() && *j != *i) {
+			++j;
+		}
+	
+		if (j != _content.end ()) {
+			_content.erase (j);
+		}
 	}
+
+	/* This won't change order, so it does not need a sort */
 	
-	return len * _loop;
+	Changed ();
 }
 
 bool
-Playlist::has_audio () const
+Playlist::has_subtitles () const
 {
-	return !_audio.empty ();
+	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
+		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
+		if (fc && !fc->subtitle_streams().empty()) {
+			return true;
+		}
+	}
+
+	return false;
 }
 
-void
-Playlist::content_changed (weak_ptr<Content> c, int p)
+class FrameRateCandidate
 {
-	ContentChanged (c, p);
-}
+public:
+	FrameRateCandidate (float source_, int dcp_)
+		: source (source_)
+		, dcp (dcp_)
+	{}
+
+	float source;
+	int dcp;
+};
 
-AudioMapping
-Playlist::default_audio_mapping () const
+int
+Playlist::best_dcp_frame_rate () const
 {
-	AudioMapping m;
-	if (_audio.empty ()) {
-		return m;
-	}
+	list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();
 
-	switch (_audio_from) {
-	case AUDIO_FFMPEG:
-	{
-		/* XXX: assumes all the same */
-		if (_audio.front()->audio_channels() == 1) {
-			/* Map mono sources to centre */
-			m.add (AudioMapping::Channel (_audio.front(), 0), libdcp::CENTRE);
-		} else {
-			int const N = min (_audio.front()->audio_channels (), MAX_AUDIO_CHANNELS);
-			/* Otherwise just start with a 1:1 mapping */
-			for (int i = 0; i < N; ++i) {
-				m.add (AudioMapping::Channel (_audio.front(), i), (libdcp::Channel) i);
-			}
-		}
-		break;
-	}
+	/* Work out what rates we could manage, including those achieved by using skip / repeat. */
+	list<FrameRateCandidate> candidates;
 
-	case AUDIO_SNDFILE:
-	{
-		int n = 0;
-		for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-			for (int j = 0; j < (*i)->audio_channels(); ++j) {
-				m.add (AudioMapping::Channel (*i, j), (libdcp::Channel) n);
-				++n;
-				if (n >= MAX_AUDIO_CHANNELS) {
-					break;
-				}
-			}
-			if (n >= MAX_AUDIO_CHANNELS) {
-				break;
-			}
-		}
-		break;
+	/* Start with the ones without skip / repeat so they will get matched in preference to skipped/repeated ones */
+	for (list<int>::const_iterator i = allowed_dcp_frame_rates.begin(); i != allowed_dcp_frame_rates.end(); ++i) {
+		candidates.push_back (FrameRateCandidate (*i, *i));
 	}
+
+	/* Then the skip/repeat ones */
+	for (list<int>::const_iterator i = allowed_dcp_frame_rates.begin(); i != allowed_dcp_frame_rates.end(); ++i) {
+		candidates.push_back (FrameRateCandidate (float (*i) / 2, *i));
+		candidates.push_back (FrameRateCandidate (float (*i) * 2, *i));
 	}
 
-	return m;
-}
+	/* Pick the best one */
+	float error = std::numeric_limits<float>::max ();
+	optional<FrameRateCandidate> best;
+	list<FrameRateCandidate>::iterator i = candidates.begin();
+	while (i != candidates.end()) {
+
+		float this_error = 0;
+		for (ContentList::const_iterator j = _content.begin(); j != _content.end(); ++j) {
+			shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*j);
+			if (!vc) {
+				continue;
+			}
 
-string
-Playlist::audio_digest () const
-{
-	string t;
-	
-	for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-		t += (*i)->digest ();
+			/* Use the largest difference between DCP and source as the "error" */
+			this_error = max (this_error, float (fabs (i->source - vc->video_frame_rate ())));
+		}
 
-		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
-		if (fc) {
-			t += lexical_cast<string> (fc->audio_stream()->id);
+		if (this_error < error) {
+			error = this_error;
+			best = *i;
 		}
-	}
 
-	t += lexical_cast<string> (_loop);
+		++i;
+	}
 
-	return md5_digest (t.c_str(), t.length());
+	if (!best) {
+		return 24;
+	}
+	
+	return best->dcp;
 }
 
-string
-Playlist::video_digest () const
+Time
+Playlist::length () const
 {
-	string t;
-	
-	for (list<shared_ptr<const VideoContent> >::const_iterator i = _video.begin(); i != _video.end(); ++i) {
-		t += (*i)->digest ();
-		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
-		if (fc && fc->subtitle_stream()) {
-			t += fc->subtitle_stream()->id;
-		}
+	Time len = 0;
+	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
+		len = max (len, (*i)->end() + 1);
 	}
 
-	t += lexical_cast<string> (_loop);
-
-	return md5_digest (t.c_str(), t.length());
+	return len;
 }
 
-ContentVideoFrame
-Playlist::content_length () const
+void
+Playlist::reconnect ()
 {
-	float const vfr = video_frame_rate() > 0 ? video_frame_rate() : 24;
-	int const afr = audio_frame_rate() > 0 ? audio_frame_rate() : 48000;
+	for (list<boost::signals2::connection>::iterator i = _content_connections.begin(); i != _content_connections.end(); ++i) {
+		i->disconnect ();
+	}
 
-        return max (
-		video_length(),
-		ContentVideoFrame (audio_length() * vfr / afr)
-		);
+	_content_connections.clear ();
+		
+	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
+		_content_connections.push_back ((*i)->Changed.connect (bind (&Playlist::content_changed, this, _1, _2, _3)));
+	}
 }
 
-void
-Playlist::set_from_xml (shared_ptr<const cxml::Node> node)
+Time
+Playlist::video_end () const
 {
-	list<shared_ptr<cxml::Node> > c = node->node_children ("Content");
-	for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
-
-		string const type = (*i)->string_child ("Type");
-		boost::shared_ptr<Content> c;
-		
-		if (type == "FFmpeg") {
-			c.reset (new FFmpegContent (*i));
-		} else if (type == "ImageMagick") {
-			c.reset (new ImageMagickContent (*i));
-		} else if (type == "Sndfile") {
-			c.reset (new SndfileContent (*i));
+	Time end = 0;
+	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
+		if (dynamic_pointer_cast<const VideoContent> (*i)) {
+			end = max (end, (*i)->end ());
 		}
-
-		_content.push_back (c);
 	}
 
-	_loop = node->number_child<int> ("Loop");
-
-	setup ();
+	return end;
 }
 
 void
-Playlist::as_xml (xmlpp::Node* node)
+Playlist::set_sequence_video (bool s)
 {
-	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
-		(*i)->as_xml (node->add_child ("Content"));
-	}
+	_sequence_video = s;
+}
 
-	node->add_child("Loop")->add_child_text(lexical_cast<string> (_loop));
+bool
+ContentSorter::operator() (shared_ptr<Content> a, shared_ptr<Content> b)
+{
+	return a->position() < b->position();
 }
 
-void
-Playlist::add (shared_ptr<Content> c)
+/** @return content in an undefined order */
+ContentList
+Playlist::content () const
 {
-	_content.push_back (c);
-	setup ();
-	Changed ();
+	return _content;
 }
 
 void
-Playlist::remove (shared_ptr<Content> c)
+Playlist::repeat (ContentList c, int n)
 {
-	ContentList::iterator i = find (_content.begin(), _content.end(), c);
-	if (i != _content.end ()) {
-		_content.erase (i);
+	pair<Time, Time> range (TIME_MAX, 0);
+	for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+		range.first = min (range.first, (*i)->position ());
+		range.second = max (range.second, (*i)->position ());
+		range.first = min (range.first, (*i)->end ());
+		range.second = max (range.second, (*i)->end ());
 	}
 
-	setup ();
+	Time pos = range.second;
+	for (int i = 0; i < n; ++i) {
+		for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+			shared_ptr<Content> copy = (*i)->clone ();
+			copy->set_position (pos + copy->position() - range.first);
+			_content.push_back (copy);
+		}
+		pos += range.second - range.first;
+	}
+
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
+	reconnect ();
 	Changed ();
 }
 
 void
 Playlist::move_earlier (shared_ptr<Content> c)
 {
-	ContentList::iterator i = find (_content.begin(), _content.end(), c);
-	if (i == _content.begin () || i == _content.end()) {
-		return;
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
+	ContentList::iterator previous = _content.end ();
+	ContentList::iterator i = _content.begin();
+	while (i != _content.end() && *i != c) {
+		previous = i;
+		++i;
 	}
 
-	ContentList::iterator j = i;
-	--j;
-
-	swap (*i, *j);
-
-	setup ();
+	assert (i != _content.end ());
+	if (previous == _content.end ()) {
+		return;
+	}
+	
+	Time const p = (*previous)->position ();
+	(*previous)->set_position (p + c->length_after_trim ());
+	c->set_position (p);
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
 	Changed ();
 }
 
 void
 Playlist::move_later (shared_ptr<Content> c)
 {
-	ContentList::iterator i = find (_content.begin(), _content.end(), c);
-	if (i == _content.end()) {
-		return;
-	}
-
-	ContentList::iterator j = i;
-	++j;
-	if (j == _content.end ()) {
-		return;
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
+	ContentList::iterator i = _content.begin();
+	while (i != _content.end() && *i != c) {
+		++i;
 	}
 
-	swap (*i, *j);
+	assert (i != _content.end ());
 
-	setup ();
-	Changed ();
-}
+	ContentList::iterator next = i;
+	++next;
 
-void
-Playlist::set_loop (int l)
-{
-	_loop = l;
-	Changed ();
-}
-		
-shared_ptr<FFmpegContent>
-Playlist::ffmpeg () const
-{
-	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-		shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
-		if (fc) {
-			return fc;
-		}
+	if (next == _content.end ()) {
+		return;
 	}
 
-	return shared_ptr<FFmpegContent> ();
+	Time const p = (*next)->position ();
+	(*next)->set_position (c->position ());
+	c->set_position (p + c->length_after_trim ());
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
+	Changed ();
 }