X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=16c740943ca89f382f27082ba70a935d987c484b;hp=e4494acb052b74f6ef545dcf8568a290a1918137;hb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;hpb=3d9fdcf7e6a5d775a2688a071b69264b1a6971c7 diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index e4494acb0..16c740943 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -19,19 +19,18 @@ #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" +#include "md5_digester.h" #include "i18n.h" @@ -47,7 +46,6 @@ 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) @@ -65,14 +63,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 () { @@ -83,16 +80,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; } @@ -109,20 +114,23 @@ Playlist::video_identifier () const } } - return md5_digest (t.c_str(), t.length()); + MD5Digester digester; + digester.add (t.c_str(), t.length()); + return digester.get (); } /** @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) { - _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 */ @@ -132,14 +140,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 (); } @@ -156,19 +163,27 @@ Playlist::remove (shared_ptr c) _content.erase (i); Changed (); } + + /* This won't change order, so it does not need a sort */ } -bool -Playlist::has_subtitles () const +void +Playlist::remove (ContentList c) { - for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - shared_ptr fc = dynamic_pointer_cast (*i); - if (fc && !fc->subtitle_streams().empty()) { - return true; + 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); } } - return false; + /* This won't change order, so it does not need a sort */ + + Changed (); } class FrameRateCandidate @@ -234,12 +249,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; @@ -259,10 +274,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 ()); @@ -272,6 +287,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) { + continue; + } + + 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) { @@ -281,37 +313,87 @@ 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 (list > c, int n) +Playlist::repeat (ContentList c, int n) { - pair range (TIME_MAX, 0); - for (list >::iterator i = c.begin(); i != c.end(); ++i) { - range.first = min (range.first, (*i)->start ()); - range.second = max (range.second, (*i)->start ()); + 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 ()); } - Time pos = range.second; + DCPTime pos = range.second; for (int i = 0; i < n; ++i) { - for (list >::iterator i = c.begin(); i != c.end(); ++i) { + for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { shared_ptr copy = (*i)->clone (); - copy->set_start (pos + copy->start() - range.first); + 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 ()); +} + +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; + } + + (*next)->set_position (c->position ()); + c->set_position (c->position() + c->length_after_trim ()); + sort (_content.begin(), _content.end(), ContentSorter ()); +}