X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=e8714e9d6d4ffedac4ab9dd6fc6ae83ee1efe66b;hp=9e96c693a529679b197ae66e0ba6c67d8a2fc248;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566 diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 9e96c693a..e8714e9d6 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "playlist.h" #include "video_content.h" #include "text_content.h" @@ -34,12 +35,12 @@ #include "compose.hpp" #include #include -#include -#include +#include #include #include "i18n.h" + using std::list; using std::cout; using std::vector; @@ -48,18 +49,21 @@ using std::max; using std::string; using std::pair; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + Playlist::Playlist () - : _sequence (true) - , _sequencing (false) { } + Playlist::~Playlist () { boost::mutex::scoped_lock lm (_mutex); @@ -67,20 +71,14 @@ Playlist::~Playlist () disconnect (); } + void Playlist::content_change (weak_ptr weak_film, ChangeType type, weak_ptr content, int property, bool frequent) { - /* Make sure we only hear about atomic changes (e.g. a PENDING always with the DONE/CANCELLED) - Ignore any DONE/CANCELLED that arrives without a PENDING. - */ - if (_checker.send (type, property)) { - return; - } - - shared_ptr film = weak_film.lock (); + auto film = weak_film.lock (); DCPOMATIC_ASSERT (film); - if (type == CHANGE_TYPE_DONE) { + if (type == ChangeType::DONE) { if ( property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END || @@ -111,14 +109,18 @@ Playlist::content_change (weak_ptr weak_film, ChangeType type, weak_ } if (changed) { - OrderChanged (); + OrderChange (); } + + /* The length might have changed, and that's good enough for this signal */ + LengthChange (); } } ContentChange (type, content, property, frequent); } + void Playlist::maybe_sequence (shared_ptr film) { @@ -128,7 +130,7 @@ Playlist::maybe_sequence (shared_ptr film) _sequencing = true; - ContentList cont = content (); + auto cont = content (); /* Keep track of the content that we've set the position of so that we don't do it twice. @@ -139,12 +141,12 @@ Playlist::maybe_sequence (shared_ptr film) DCPTime next_left; DCPTime next_right; - BOOST_FOREACH (shared_ptr i, cont) { + for (auto i: cont) { if (!i->video) { continue; } - if (i->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { + if (i->video->frame_type() == VideoFrameType::THREE_D_RIGHT) { i->set_position (film, next_right); next_right = i->end(film); } else { @@ -158,7 +160,7 @@ Playlist::maybe_sequence (shared_ptr film) /* Captions */ DCPTime next; - BOOST_FOREACH (shared_ptr i, cont) { + for (auto i: cont) { if (i->text.empty() || find (placed.begin(), placed.end(), i) != placed.end()) { continue; } @@ -173,14 +175,15 @@ Playlist::maybe_sequence (shared_ptr film) _sequencing = false; } + string Playlist::video_identifier () const { string t; - BOOST_FOREACH (shared_ptr i, content()) { + for (auto i: content()) { bool burn = false; - BOOST_FOREACH (shared_ptr j, i->text) { + for (auto j: i->text) { if (j->burn()) { burn = true; } @@ -195,6 +198,7 @@ Playlist::video_identifier () const return digester.get (); } + /** @param film Film that this Playlist is for. * @param node <Playlist> node. * @param version Metadata version number. @@ -205,11 +209,11 @@ Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, in { boost::mutex::scoped_lock lm (_mutex); - BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Content")) { - shared_ptr content = content_factory (i, version, notes); + for (auto i: node->node_children ("Content")) { + auto content = content_factory (i, version, notes); /* See if this content should be nudged to start on a video frame */ - DCPTime const old_pos = content->position(); + auto const old_pos = content->position(); content->set_position(film, old_pos); if (old_pos != content->position()) { string note = _("Your project contains video content that was not aligned to a frame boundary."); @@ -229,7 +233,7 @@ Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, in } /* ...or have a start trim which is an integer number of frames */ - ContentTime const old_trim = content->trim_start(); + auto const old_trim = content->trim_start(); content->set_trim_start(old_trim); if (old_trim != content->trim_start()) { string note = _("Your project contains video content whose trim was not aligned to a frame boundary."); @@ -257,21 +261,23 @@ Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, in reconnect (film); } + /** @param node <Playlist> node. * @param with_content_paths true to include <Path> nodes in <Content> nodes, false to omit them. */ void Playlist::as_xml (xmlpp::Node* node, bool with_content_paths) { - BOOST_FOREACH (shared_ptr i, content()) { + for (auto i: content()) { i->as_xml (node->add_child ("Content"), with_content_paths); } } + void Playlist::add (shared_ptr film, shared_ptr c) { - Change (CHANGE_TYPE_PENDING); + Change (ChangeType::PENDING); { boost::mutex::scoped_lock lm (_mutex); @@ -280,20 +286,23 @@ Playlist::add (shared_ptr film, shared_ptr c) reconnect (film); } - Change (CHANGE_TYPE_DONE); + Change (ChangeType::DONE); + + LengthChange (); } + void Playlist::remove (shared_ptr c) { - Change (CHANGE_TYPE_PENDING); + Change (ChangeType::PENDING); bool cancelled = false; { boost::mutex::scoped_lock lm (_mutex); - ContentList::iterator i = _content.begin (); + auto i = _content.begin (); while (i != _content.end() && *i != c) { ++i; } @@ -306,24 +315,27 @@ Playlist::remove (shared_ptr c) } if (cancelled) { - Change (CHANGE_TYPE_CANCELLED); + Change (ChangeType::CANCELLED); } else { - Change (CHANGE_TYPE_DONE); + Change (ChangeType::DONE); } /* This won't change order, so it does not need a sort */ + + LengthChange (); } + void Playlist::remove (ContentList c) { - Change (CHANGE_TYPE_PENDING); + Change (ChangeType::PENDING); { boost::mutex::scoped_lock lm (_mutex); - BOOST_FOREACH (shared_ptr i, c) { - ContentList::iterator j = _content.begin (); + for (auto i: c) { + auto j = _content.begin (); while (j != _content.end() && *j != i) { ++j; } @@ -334,11 +346,14 @@ Playlist::remove (ContentList c) } } + Change (ChangeType::DONE); + /* This won't change order, so it does not need a sort */ - Change (CHANGE_TYPE_DONE); + LengthChange (); } + class FrameRateCandidate { public: @@ -351,22 +366,23 @@ public: int dcp; }; + /** @return the best frame rate from Config::_allowed_dcp_frame_rates for the content in this list */ int Playlist::best_video_frame_rate () const { - list const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates (); + auto const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates (); /* Work out what rates we could manage, including those achieved by using skip / repeat */ list candidates; /* Start with the ones without skip / repeat so they will get matched in preference to skipped/repeated ones */ - BOOST_FOREACH (int i, allowed_dcp_frame_rates) { + for (auto i: allowed_dcp_frame_rates) { candidates.push_back (FrameRateCandidate(i, i)); } /* Then the skip/repeat ones */ - BOOST_FOREACH (int i, allowed_dcp_frame_rates) { + for (auto i: allowed_dcp_frame_rates) { candidates.push_back (FrameRateCandidate (float(i) / 2, i)); candidates.push_back (FrameRateCandidate (float(i) * 2, i)); } @@ -374,11 +390,11 @@ Playlist::best_video_frame_rate () const /* Pick the best one */ float error = std::numeric_limits::max (); optional best; - list::iterator i = candidates.begin(); + auto i = candidates.begin(); while (i != candidates.end()) { float this_error = 0; - BOOST_FOREACH (shared_ptr j, content()) { + for (auto j: content()) { if (!j->video || !j->video_frame_rate()) { continue; } @@ -408,62 +424,67 @@ Playlist::best_video_frame_rate () const return best->dcp; } + /** @return length of the playlist from time 0 to the last thing on the playlist */ DCPTime Playlist::length (shared_ptr film) const { DCPTime len; - BOOST_FOREACH (shared_ptr i, content()) { + for (auto i: content()) { len = max (len, i->end(film)); } return len; } + /** @return position of the first thing on the playlist, if it's not empty */ optional Playlist::start () const { - ContentList cont = content (); + auto cont = content (); if (cont.empty()) { - return optional (); + return {}; } - DCPTime start = DCPTime::max (); - BOOST_FOREACH (shared_ptr i, cont) { + auto start = DCPTime::max (); + for (auto i: cont) { start = min (start, i->position ()); } return start; } + /** Must be called with a lock held on _mutex */ void Playlist::disconnect () { - BOOST_FOREACH (boost::signals2::connection& i, _content_connections) { + for (auto& i: _content_connections) { i.disconnect (); } _content_connections.clear (); } + /** Must be called with a lock held on _mutex */ void Playlist::reconnect (shared_ptr film) { disconnect (); - BOOST_FOREACH (shared_ptr i, _content) { + for (auto i: _content) { _content_connections.push_back (i->Change.connect(boost::bind(&Playlist::content_change, this, film, _1, _2, _3, _4))); } } + DCPTime Playlist::video_end (shared_ptr film) const { DCPTime end; - BOOST_FOREACH (shared_ptr i, content()) { + for (auto i: content()) { if (i->video) { end = max (end, i->end(film)); } @@ -472,11 +493,12 @@ Playlist::video_end (shared_ptr film) const return end; } + DCPTime Playlist::text_end (shared_ptr film) const { DCPTime end; - BOOST_FOREACH (shared_ptr i, content()) { + for (auto i: content()) { if (!i->text.empty ()) { end = max (end, i->end(film)); } @@ -485,10 +507,11 @@ Playlist::text_end (shared_ptr film) const return end; } + FrameRateChange Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const { - ContentList cont = content (); + auto cont = content (); for (ContentList::const_reverse_iterator i = cont.rbegin(); i != cont.rend(); ++i) { if (!(*i)->video) { continue; @@ -511,12 +534,14 @@ Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate); } + void Playlist::set_sequence (bool s) { _sequence = s; } + bool ContentSorter::operator() (shared_ptr a, shared_ptr b) { @@ -535,6 +560,7 @@ ContentSorter::operator() (shared_ptr a, shared_ptr b) return a->digest() < b->digest(); } + /** @return content in ascending order of position */ ContentList Playlist::content () const @@ -543,26 +569,27 @@ Playlist::content () const return _content; } + void Playlist::repeat (shared_ptr film, ContentList c, int n) { - pair range (DCPTime::max (), DCPTime ()); - BOOST_FOREACH (shared_ptr i, c) { + pair range (DCPTime::max(), DCPTime()); + for (auto i: c) { range.first = min (range.first, i->position ()); range.second = max (range.second, i->position ()); range.first = min (range.first, i->end(film)); range.second = max (range.second, i->end(film)); } - Change (CHANGE_TYPE_PENDING); + Change (ChangeType::PENDING); { boost::mutex::scoped_lock lm (_mutex); DCPTime pos = range.second; for (int i = 0; i < n; ++i) { - BOOST_FOREACH (shared_ptr j, c) { - shared_ptr copy = j->clone (); + for (auto j: c) { + auto copy = j->clone (); copy->set_position (film, pos + copy->position() - range.first); _content.push_back (copy); } @@ -573,15 +600,16 @@ Playlist::repeat (shared_ptr film, ContentList c, int n) reconnect (film); } - Change (CHANGE_TYPE_DONE); + Change (ChangeType::DONE); } + void Playlist::move_earlier (shared_ptr film, shared_ptr c) { - ContentList cont = content (); - ContentList::iterator previous = cont.end(); - ContentList::iterator i = cont.begin(); + auto cont = content (); + auto previous = cont.end(); + auto i = cont.begin(); while (i != cont.end() && *i != c) { previous = i; ++i; @@ -592,18 +620,19 @@ Playlist::move_earlier (shared_ptr film, shared_ptr c) return; } - shared_ptr previous_c = *previous; + auto previous_c = *previous; - DCPTime const p = previous_c->position (); + auto const p = previous_c->position (); previous_c->set_position (film, p + c->length_after_trim(film)); c->set_position (film, p); } + void Playlist::move_later (shared_ptr film, shared_ptr c) { - ContentList cont = content (); - ContentList::iterator i = cont.begin(); + auto cont = content (); + auto i = cont.begin(); while (i != cont.end() && *i != c) { ++i; } @@ -617,20 +646,21 @@ Playlist::move_later (shared_ptr film, shared_ptr c) return; } - shared_ptr next_c = *next; + auto next_c = *next; next_c->set_position (film, c->position()); c->set_position (film, c->position() + next_c->length_after_trim(film)); } + int64_t Playlist::required_disk_space (shared_ptr film, int j2k_bandwidth, int audio_channels, int audio_frame_rate) const { int64_t video = uint64_t (j2k_bandwidth / 8) * length(film).seconds(); int64_t audio = uint64_t (audio_channels * audio_frame_rate * 3) * length(film).seconds(); - BOOST_FOREACH (shared_ptr i, content()) { - shared_ptr d = dynamic_pointer_cast (i); + for (auto i: content()) { + auto d = dynamic_pointer_cast (i); if (d) { if (d->reference_video()) { video -= uint64_t (j2k_bandwidth / 8) * d->length_after_trim(film).seconds(); @@ -645,14 +675,15 @@ Playlist::required_disk_space (shared_ptr film, int j2k_bandwidth, i return video + audio + 65536; } + string Playlist::content_summary (shared_ptr film, DCPTimePeriod period) const { string best_summary; int best_score = -1; - BOOST_FOREACH (shared_ptr i, content()) { + for (auto i: content()) { int score = 0; - optional const o = DCPTimePeriod(i->position(), i->end(film)).overlap (period); + auto const o = DCPTimePeriod(i->position(), i->end(film)).overlap (period); if (o) { score += 100 * o.get().duration().get() / period.duration().get(); } @@ -670,12 +701,13 @@ Playlist::content_summary (shared_ptr film, DCPTimePeriod period) co return best_summary; } + pair Playlist::speed_up_range (int dcp_video_frame_rate) const { pair range (DBL_MAX, -DBL_MAX); - BOOST_FOREACH (shared_ptr i, content()) { + for (auto i: content()) { if (!i->video) { continue; }