X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=214badc7ee8b8e62ce7d0ed0f5bcc287e34a5996;hb=bb0a36c3a6bea9cd1ebdde7b8a3a04765e317569;hp=5ee764a8e73d4e14491e3bac9d6333b19fb87392;hpb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;p=dcpomatic.git diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 5ee764a8e..214badc7e 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -19,15 +19,14 @@ #include #include -#include #include "playlist.h" #include "sndfile_content.h" #include "sndfile_decoder.h" #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" @@ -41,28 +40,19 @@ 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 () - : _loop (1) - , _sequence_video (true) + : _sequence_video (true) , _sequencing_video (false) { } -Playlist::Playlist (shared_ptr other) - : _loop (other->_loop) -{ - for (ContentList::const_iterator i = other->_content.begin(); i != other->_content.end(); ++i) { - _content.push_back ((*i)->clone ()); - } -} - Playlist::~Playlist () { _content.clear (); @@ -70,98 +60,74 @@ Playlist::~Playlist () } void -Playlist::content_changed (weak_ptr c, int p) +Playlist::content_changed (weak_ptr content, int property, bool frequent) { - if (p == ContentProperty::LENGTH && _sequence_video && !_sequencing_video) { - _sequencing_video = true; - - ContentList cl = _content; - sort (cl.begin(), cl.end(), ContentSorter ()); - Time last = 0; - for (ContentList::iterator i = cl.begin(); i != cl.end(); ++i) { - if (!dynamic_pointer_cast (*i)) { - continue; - } - - (*i)->set_start (last); - last = (*i)->end (); - } - - _sequencing_video = false; + if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) { + maybe_sequence_video (); } - ContentChanged (c, p); + ContentChanged (content, property, frequent); } -string -Playlist::audio_digest () const +void +Playlist::maybe_sequence_video () { - string t; + if (!_sequence_video || _sequencing_video) { + return; + } - for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - if (!dynamic_pointer_cast (*i)) { + _sequencing_video = true; + + ContentList cl = _content; + DCPTime next_left; + DCPTime next_right; + for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) { + shared_ptr vc = dynamic_pointer_cast (*i); + if (!vc) { continue; } - t += (*i)->digest (); - - shared_ptr fc = dynamic_pointer_cast (*i); - if (fc) { - t += lexical_cast (fc->audio_stream()->id); + if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { + vc->set_position (next_right); + next_right = vc->end() + DCPTime::delta (); + } else { + vc->set_position (next_left); + next_left = vc->end() + DCPTime::delta (); } } - t += lexical_cast (_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 (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - if (!dynamic_pointer_cast (*i)) { - continue; - } - - t += (*i)->digest (); - shared_ptr fc = dynamic_pointer_cast (*i); - if (fc && fc->subtitle_stream()) { - t += fc->subtitle_stream()->id; + shared_ptr vc = dynamic_pointer_cast (*i); + if (vc) { + t += vc->identifier (); } } - t += lexical_cast (_loop); - return md5_digest (t.c_str(), t.length()); } /** @param node node */ void -Playlist::set_from_xml (shared_ptr film, shared_ptr node) +Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, int version, list& notes) { - list > c = node->node_children ("Content"); - for (list >::iterator i = c.begin(); i != c.end(); ++i) { - string const type = (*i)->string_child ("Type"); - - boost::shared_ptr content; - - if (type == "FFmpeg") { - content.reset (new FFmpegContent (film, *i)); - } else if (type == "ImageMagick") { - content.reset (new ImageMagickContent (film, *i)); - } else if (type == "Sndfile") { - content.reset (new SndfileContent (film, *i)); - } - - _content.push_back (content); + list c = node->node_children ("Content"); + for (list::iterator i = c.begin(); i != c.end(); ++i) { + _content.push_back (content_factory (film, *i, version, notes)); } + sort (_content.begin(), _content.end(), ContentSorter ()); + reconnect (); - _loop = node->number_child ("Loop"); - _sequence_video = node->bool_child ("SequenceVideo"); } /** @param node node */ @@ -171,15 +137,13 @@ Playlist::as_xml (xmlpp::Node* node) 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 (_loop)); - node->add_child("SequenceVideo")->add_child_text(_sequence_video ? "1" : "0"); } void Playlist::add (shared_ptr c) { _content.push_back (c); + sort (_content.begin(), _content.end(), ContentSorter ()); reconnect (); Changed (); } @@ -196,12 +160,26 @@ Playlist::remove (shared_ptr c) _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 (); } @@ -249,20 +227,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::max (); optional best; list::iterator i = candidates.begin(); while (i != candidates.end()) { - float this_error = std::numeric_limits::max (); + float this_error = 0; for (ContentList::const_iterator j = _content.begin(); j != _content.end(); ++j) { shared_ptr vc = dynamic_pointer_cast (*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) { @@ -280,12 +259,12 @@ Playlist::best_dcp_frame_rate () const return best->dcp; } -Time +DCPTime Playlist::length () const { - Time len = 0; + DCPTime len; for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - len = max (len, (*i)->end ()); + len = max (len, (*i)->end() + DCPTime::delta ()); } return len; @@ -301,14 +280,14 @@ Playlist::reconnect () _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))); + _content_connections.push_back ((*i)->Changed.connect (bind (&Playlist::content_changed, this, _1, _2, _3))); } } -Time +DCPTime Playlist::video_end () const { - Time end = 0; + DCPTime end; for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { if (dynamic_pointer_cast (*i)) { end = max (end, (*i)->end ()); @@ -318,6 +297,23 @@ Playlist::video_end () const 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 vc = dynamic_pointer_cast (*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) { @@ -327,5 +323,91 @@ Playlist::set_sequence_video (bool s) bool ContentSorter::operator() (shared_ptr a, shared_ptr b) { - return a->start() < b->start(); + 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 range (DCPTime::max (), DCPTime ()); + 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 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 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 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 (); }