X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=9a048980c0b02aebadd481db236149df8544de8e;hb=308488324dbc4d8b709d3fb1dc9fee0479346c21;hp=31b16b646f9237cdbaca486d88257722f691dd02;hpb=86461ade4087f8473c1e8b063907d92884813843;p=dcpomatic.git diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 31b16b646..9a048980c 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -19,15 +19,13 @@ #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" @@ -42,11 +40,11 @@ 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 () : _sequence_video (true) @@ -64,14 +62,13 @@ Playlist::~Playlist () void Playlist::content_changed (weak_ptr content, int property, bool frequent) { - if (property == ContentProperty::LENGTH) { + if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) { maybe_sequence_video (); } ContentChanged (content, property, frequent); } - void Playlist::maybe_sequence_video () { @@ -82,16 +79,24 @@ Playlist::maybe_sequence_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)) { + 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; } - (*i)->set_start (last); - last = (*i)->end (); + 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 (); + } } + + /* This won't change order, so it does not need a sort */ _sequencing_video = false; } @@ -113,15 +118,16 @@ Playlist::video_identifier () const /** @param node node */ void -Playlist::set_from_xml (shared_ptr film, shared_ptr node) +Playlist::set_from_xml (shared_ptr film, shared_ptr node, int version, list& notes) { - list > c = node->node_children ("Content"); - for (list >::iterator i = c.begin(); i != c.end(); ++i) { - _content.push_back (content_factory (film, *i)); + 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 (); - _sequence_video = node->bool_child ("SequenceVideo"); } /** @param node node */ @@ -131,14 +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("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 (); } @@ -155,6 +160,27 @@ Playlist::remove (shared_ptr c) _content.erase (i); Changed (); } + + /* This won't change order, so it does not need a sort */ +} + +void +Playlist::remove (ContentList c) +{ + 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 @@ -233,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; @@ -258,10 +284,10 @@ Playlist::reconnect () } } -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 ()); @@ -271,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) { @@ -280,27 +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 */ -Playlist::ContentList +ContentList Playlist::content () const { return _content; } void -Playlist::repeat (shared_ptr c, int n) +Playlist::repeat (ContentList c, int n) { - Time pos = c->end (); + 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) { - shared_ptr copy = c->clone (); - copy->set_start (pos); - _content.push_back (copy); - pos = copy->end (); + 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 (); +}