X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fplaylist.cc;h=4175de4c9ce89d4f4baf8b403e92dac1ffcb05d0;hb=e2be8234013335379bd49a53854218039348c7a4;hp=8db5c5fc2bced2a8745a28effd3d0a33b7824ff1;hpb=2de990b0155fcb5c3dac821ef8c2659e903d2f6e;p=dcpomatic.git

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 8db5c5fc2..4175de4c9 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -28,8 +26,8 @@
 #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"
@@ -43,6 +41,7 @@ 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;
@@ -50,124 +49,140 @@ using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
 
 Playlist::Playlist ()
-	: _loop (1)
+	: _sequence_video (true)
+	, _sequencing_video (false)
 {
 
 }
 
-Playlist::Playlist (shared_ptr<const Playlist> other)
-	: _loop (other->_loop)
+Playlist::~Playlist ()
 {
-	for (RegionList::const_iterator i = other->_regions.begin(); i != other->_regions.end(); ++i) {
-		_regions.push_back (shared_ptr<Region> (new Region ((*i)->content->clone(), (*i)->time, this)));
-	}
+	_content.clear ();
+	reconnect ();
 }
 
 void
-Playlist::content_changed (weak_ptr<Content> c, int p)
+Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
 {
-	ContentChanged (c, p);
+	if (property == ContentProperty::LENGTH) {
+		maybe_sequence_video ();
+	}
+	
+	ContentChanged (content, property, frequent);
 }
 
-string
-Playlist::audio_digest () const
+void
+Playlist::maybe_sequence_video ()
 {
-	string t;
+	if (!_sequence_video || _sequencing_video) {
+		return;
+	}
+	
+	_sequencing_video = true;
 	
-	for (RegionList::const_iterator i = _regions.begin(); i != _regions.end(); ++i) {
-		if (!dynamic_pointer_cast<const AudioContent> ((*i)->content)) {
+	ContentList cl = _content;
+	DCPTime next = 0;
+	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
+		if (!dynamic_pointer_cast<VideoContent> (*i)) {
 			continue;
 		}
 		
-		t += (*i)->content->digest ();
-
-		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> ((*i)->content);
-		if (fc) {
-			t += lexical_cast<string> (fc->audio_stream()->id);
-		}
+		(*i)->set_position (next);
+		next = (*i)->end() + 1;
 	}
 
-	t += lexical_cast<string> (_loop);
-
-	return md5_digest (t.c_str(), t.length());
+	/* This won't change order, so it does not need a sort */
+	
+	_sequencing_video = false;
 }
 
 string
-Playlist::video_digest () const
+Playlist::video_identifier () const
 {
 	string t;
 	
-	for (RegionList::const_iterator i = _regions.begin(); i != _regions.end(); ++i) {
-		if (!dynamic_pointer_cast<const VideoContent> ((*i)->content)) {
-			continue;
-		}
-		
-		t += (*i)->content->digest ();
-		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> ((*i)->content);
-		if (fc && fc->subtitle_stream()) {
-			t += fc->subtitle_stream()->id;
+	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 ();
 		}
 	}
 
-	t += lexical_cast<string> (_loop);
-
 	return md5_digest (t.c_str(), t.length());
 }
 
+/** @param node <Playlist> node */
 void
-Playlist::set_from_xml (shared_ptr<const cxml::Node> node)
+Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version)
 {
-	list<shared_ptr<cxml::Node> > c = node->node_children ("Region");
-	for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
-		_regions.push_back (shared_ptr<Region> (new Region (*i, this)));
+	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));
 	}
 
-	_loop = node->number_child<int> ("Loop");
+	sort (_content.begin(), _content.end(), ContentSorter ());
+
+	reconnect ();
 }
 
+/** @param node <Playlist> node */
 void
 Playlist::as_xml (xmlpp::Node* node)
 {
-	for (RegionList::iterator i = _regions.begin(); i != _regions.end(); ++i) {
-		(*i)->as_xml (node->add_child ("Region"));
+	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
+		(*i)->as_xml (node->add_child ("Content"));
 	}
-
-	node->add_child("Loop")->add_child_text(lexical_cast<string> (_loop));
 }
 
 void
 Playlist::add (shared_ptr<Content> c)
 {
-	_regions.push_back (shared_ptr<Region> (new Region (c, 0, this)));
+	_content.push_back (c);
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	reconnect ();
 	Changed ();
 }
 
 void
 Playlist::remove (shared_ptr<Content> c)
 {
-	RegionList::iterator i = _regions.begin ();
-	while (i != _regions.end() && (*i)->content != c) {
+	ContentList::iterator i = _content.begin ();
+	while (i != _content.end() && *i != c) {
 		++i;
 	}
 	
-	if (i != _regions.end ()) {
-		_regions.erase (i);
+	if (i != _content.end ()) {
+		_content.erase (i);
 		Changed ();
 	}
+
+	/* This won't change order, so it does not need a sort */
 }
 
 void
-Playlist::set_loop (int l)
+Playlist::remove (ContentList c)
 {
-	_loop = l;
+	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 */
+	
 	Changed ();
 }
 
 bool
 Playlist::has_subtitles () const
 {
-	for (RegionList::const_iterator i = _regions.begin(); i != _regions.end(); ++i) {
-		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> ((*i)->content);
+	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;
 		}
@@ -176,40 +191,6 @@ Playlist::has_subtitles () const
 	return false;
 }
 
-Playlist::Region::Region (shared_ptr<Content> c, Time t, Playlist* p)
-	: content (c)
-	, time (t)
-{
-	connection = c->Changed.connect (bind (&Playlist::content_changed, p, _1, _2));
-}
-
-Playlist::Region::Region (shared_ptr<const cxml::Node> node, Playlist* p)
-{
-	shared_ptr<const cxml::Node> content_node = node->node_child ("Content");
-	string const type = content_node->string_child ("Type");
-
-	if (type == "FFmpeg") {
-		content.reset (new FFmpegContent (content_node));
-	} else if (type == "ImageMagick") {
-		content.reset (new ImageMagickContent (content_node));
-	} else if (type == "Sndfile") {
-		content.reset (new SndfileContent (content_node));
-	}
-
-	time = node->number_child<Time> ("Time");
-	audio_mapping = AudioMapping (node->node_child ("AudioMapping"));
-	connection = content->Changed.connect (bind (&Playlist::content_changed, p, _1, _2));
-}
-
-void
-Playlist::Region::as_xml (xmlpp::Node* node) const
-{
-	xmlpp::Node* sub = node->add_child ("Content");
-	content->as_xml (sub);
-	node->add_child ("Time")->add_child_text (lexical_cast<string> (time));
-	audio_mapping.as_xml (node->add_child ("AudioMapping"));
-}
-
 class FrameRateCandidate
 {
 public:
@@ -241,20 +222,21 @@ Playlist::best_dcp_frame_rate () const
 		candidates.push_back (FrameRateCandidate (float (*i) * 2, *i));
 	}
 
-	/* Pick the best one, bailing early if we hit an exact match */
+	/* 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 = std::numeric_limits<float>::max ();
-		for (RegionList::const_iterator j = _regions.begin(); j != _regions.end(); ++j) {
-			shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> ((*j)->content);
+		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;
 			}
 
-			this_error += fabs (i->source - vc->video_frame_rate ());
+			/* Use the largest difference between DCP and source as the "error" */
+			this_error = max (this_error, float (fabs (i->source - vc->video_frame_rate ())));
 		}
 
 		if (this_error < error) {
@@ -272,14 +254,155 @@ Playlist::best_dcp_frame_rate () const
 	return best->dcp;
 }
 
-Time
-Playlist::length (shared_ptr<const Film> film) const
+DCPTime
+Playlist::length () const
 {
-	Time len = 0;
-	for (RegionList::const_iterator i = _regions.begin(); i != _regions.end(); ++i) {
-		Time const t = (*i)->time + (*i)->content->length (film);
-		len = max (len, t);
+	DCPTime len = 0;
+	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
+		len = max (len, (*i)->end() + 1);
 	}
 
 	return len;
 }
+
+void
+Playlist::reconnect ()
+{
+	for (list<boost::signals2::connection>::iterator i = _content_connections.begin(); i != _content_connections.end(); ++i) {
+		i->disconnect ();
+	}
+
+	_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)));
+	}
+}
+
+DCPTime
+Playlist::video_end () const
+{
+	DCPTime 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 ());
+		}
+	}
+
+	return end;
+}
+
+FrameRateChange
+Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const
+{
+	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
+		shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
+		if (!vc) {
+			break;
+		}
+
+		if (vc->position() >= t && t < vc->end()) {
+			return FrameRateChange (vc->video_frame_rate(), dcp_video_frame_rate);
+		}
+	}
+
+	return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate);
+}
+
+void
+Playlist::set_sequence_video (bool s)
+{
+	_sequence_video = s;
+}
+
+bool
+ContentSorter::operator() (shared_ptr<Content> a, shared_ptr<Content> b)
+{
+	return a->position() < b->position();
+}
+
+/** @return content in an undefined order */
+ContentList
+Playlist::content () const
+{
+	return _content;
+}
+
+void
+Playlist::repeat (ContentList c, int n)
+{
+	pair<DCPTime, DCPTime> 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 ());
+	}
+
+	DCPTime 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)
+{
+	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;
+	}
+
+	assert (i != _content.end ());
+	if (previous == _content.end ()) {
+		return;
+	}
+	
+	DCPTime 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)
+{
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
+	ContentList::iterator i = _content.begin();
+	while (i != _content.end() && *i != c) {
+		++i;
+	}
+
+	assert (i != _content.end ());
+
+	ContentList::iterator next = i;
+	++next;
+
+	if (next == _content.end ()) {
+		return;
+	}
+
+	DCPTime const p = (*next)->position ();
+	(*next)->set_position (c->position ());
+	c->set_position (p + c->length_after_trim ());
+	sort (_content.begin(), _content.end(), ContentSorter ());
+	
+	Changed ();
+}