X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=16c740943ca89f382f27082ba70a935d987c484b;hb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;hp=1712dc8ff54dee392f5e865830aa91cea76c2cf1;hpb=6b35b4764ac5446c845a1dde9a01e0401862d835;p=dcpomatic.git diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 1712dc8ff..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 "still_image_decoder.h" -#include "still_image_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,7 +63,7 @@ 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 (); } @@ -82,14 +80,21 @@ Playlist::maybe_sequence_video () _sequencing_video = true; ContentList cl = _content; - Time last = 0; + DCPTime next_left; + DCPTime next_right; for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) { - if (!dynamic_pointer_cast (*i)) { + shared_ptr vc = dynamic_pointer_cast (*i); + if (!vc) { continue; } - (*i)->set_position (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 */ @@ -109,16 +114,18 @@ 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 ()); @@ -179,19 +186,6 @@ Playlist::remove (ContentList c) Changed (); } -bool -Playlist::has_subtitles () const -{ - 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; - } - } - - return false; -} - class FrameRateCandidate { public: @@ -255,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; @@ -280,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 ()); @@ -293,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) { @@ -315,7 +326,7 @@ Playlist::content () const void Playlist::repeat (ContentList c, int n) { - pair range (TIME_MAX, 0); + 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 ()); @@ -323,7 +334,7 @@ Playlist::repeat (ContentList c, int n) range.second = max (range.second, (*i)->end ()); } - Time pos = range.second; + 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 (); @@ -355,13 +366,12 @@ Playlist::move_earlier (shared_ptr c) if (previous == _content.end ()) { return; } + - Time const p = (*previous)->position (); + 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 @@ -383,10 +393,7 @@ Playlist::move_later (shared_ptr c) return; } - Time const p = (*next)->position (); (*next)->set_position (c->position ()); - c->set_position (p + c->length_after_trim ()); + c->set_position (c->position() + c->length_after_trim ()); sort (_content.begin(), _content.end(), ContentSorter ()); - - Changed (); }