X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=a1b209a1199cafc94c4fa1544160615f446d7526;hb=4704d088ae03ab2b5f73ceed577fd84935ad0640;hp=22412da4a3640b5313cd6d75cdb25422a4ee08f6;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 22412da4a..a1b209a11 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,8 +17,6 @@ */ -#include -#include #include "playlist.h" #include "sndfile_content.h" #include "sndfile_decoder.h" @@ -31,6 +29,10 @@ #include "config.h" #include "util.h" #include "md5_digester.h" +#include +#include +#include +#include #include "i18n.h" @@ -62,10 +64,16 @@ Playlist::~Playlist () void Playlist::content_changed (weak_ptr content, int property, bool frequent) { + /* Don't respond to position changes here, as: + - sequencing after earlier/later changes is handled by move_earlier/move_later + - any other position changes will be timeline drags which should not result in content + being sequenced. + */ + if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) { maybe_sequence_video (); } - + ContentChanged (content, property, frequent); } @@ -75,18 +83,17 @@ Playlist::maybe_sequence_video () if (!_sequence_video || _sequencing_video) { return; } - + _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); + BOOST_FOREACH (shared_ptr i, _content) { + shared_ptr vc = dynamic_pointer_cast (i); if (!vc) { continue; } - + if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { vc->set_position (next_right); next_right = vc->end() + DCPTime::delta (); @@ -97,7 +104,7 @@ Playlist::maybe_sequence_video () } /* This won't change order, so it does not need a sort */ - + _sequencing_video = false; } @@ -105,11 +112,14 @@ string Playlist::video_identifier () const { string t; - - for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - shared_ptr vc = dynamic_pointer_cast (*i); + + BOOST_FOREACH (shared_ptr i, _content) { + shared_ptr vc = dynamic_pointer_cast (i); + shared_ptr sc = dynamic_pointer_cast (i); if (vc) { t += vc->identifier (); + } else if (sc && sc->burn_subtitles ()) { + t += sc->identifier (); } } @@ -122,9 +132,8 @@ Playlist::video_identifier () const void 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, version, notes)); + BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Content")) { + _content.push_back (content_factory (film, i, version, notes)); } sort (_content.begin(), _content.end(), ContentSorter ()); @@ -136,8 +145,8 @@ Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, in void Playlist::as_xml (xmlpp::Node* node) { - for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) { - (*i)->as_xml (node->add_child ("Content")); + BOOST_FOREACH (shared_ptr i, _content) { + i->as_xml (node->add_child ("Content")); } } @@ -157,7 +166,7 @@ Playlist::remove (shared_ptr c) while (i != _content.end() && *i != c) { ++i; } - + if (i != _content.end ()) { _content.erase (i); Changed (); @@ -169,19 +178,19 @@ Playlist::remove (shared_ptr c) void Playlist::remove (ContentList c) { - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { + BOOST_FOREACH (shared_ptr i, c) { ContentList::iterator j = _content.begin (); - while (j != _content.end() && *j != *i) { + 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 (); } @@ -223,14 +232,20 @@ Playlist::best_dcp_frame_rate () const while (i != candidates.end()) { float this_error = 0; - for (ContentList::const_iterator j = _content.begin(); j != _content.end(); ++j) { - shared_ptr vc = dynamic_pointer_cast (*j); + BOOST_FOREACH (shared_ptr j, _content) { + shared_ptr vc = dynamic_pointer_cast (j); if (!vc) { continue; } + /* Best error for this content; we could use the content as-is or double its rate */ + float best_error = min ( + float (fabs (i->source - vc->video_frame_rate ())), + float (fabs (i->source - vc->video_frame_rate () * 2)) + ); + /* Use the largest difference between DCP and source as the "error" */ - this_error = max (this_error, float (fabs (i->source - vc->video_frame_rate ()))); + this_error = max (this_error, best_error); } if (this_error < error) { @@ -244,7 +259,7 @@ Playlist::best_dcp_frame_rate () const if (!best) { return 24; } - + return best->dcp; } @@ -252,8 +267,8 @@ DCPTime Playlist::length () const { DCPTime len; - for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - len = max (len, (*i)->end() + DCPTime::delta ()); + BOOST_FOREACH (shared_ptr i, _content) { + len = max (len, i->end()); } return len; @@ -267,9 +282,9 @@ 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, _3))); + + BOOST_FOREACH (shared_ptr i, _content) { + _content_connections.push_back (i->Changed.connect (bind (&Playlist::content_changed, this, _1, _2, _3))); } } @@ -277,9 +292,9 @@ DCPTime Playlist::video_end () const { DCPTime end; - for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - if (dynamic_pointer_cast (*i)) { - end = max (end, (*i)->end ()); + BOOST_FOREACH (shared_ptr i, _content) { + if (dynamic_pointer_cast (i)) { + end = max (end, i->end ()); } } @@ -289,13 +304,16 @@ Playlist::video_end () const 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) { + for (ContentList::const_reverse_iterator i = _content.rbegin(); i != _content.rend(); ++i) { shared_ptr vc = dynamic_pointer_cast (*i); if (!vc) { continue; } - if (vc->position() >= t && t < vc->end()) { + if (vc->position() <= t) { + /* This is the first piece of content (going backwards...) that starts before t, + so it's the active one. + */ return FrameRateChange (vc->video_frame_rate(), dcp_video_frame_rate); } } @@ -326,17 +344,17 @@ 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 ()); + BOOST_FOREACH (shared_ptr i, c) { + 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 (); + BOOST_FOREACH (shared_ptr j, c) { + shared_ptr copy = j->clone (); copy->set_position (pos + copy->position() - range.first); _content.push_back (copy); } @@ -344,7 +362,7 @@ Playlist::repeat (ContentList c, int n) } sort (_content.begin(), _content.end(), ContentSorter ()); - + reconnect (); Changed (); } @@ -353,7 +371,7 @@ 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) { @@ -361,12 +379,12 @@ Playlist::move_earlier (shared_ptr c) ++i; } - assert (i != _content.end ()); + DCPOMATIC_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); @@ -377,13 +395,13 @@ 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 ()); + DCPOMATIC_ASSERT (i != _content.end ()); ContentList::iterator next = i; ++next; @@ -393,6 +411,6 @@ Playlist::move_later (shared_ptr c) } (*next)->set_position (c->position ()); - c->set_position (c->position() + c->length_after_trim ()); + c->set_position (c->position() + (*next)->length_after_trim ()); sort (_content.begin(), _content.end(), ContentSorter ()); }