X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=e8714e9d6d4ffedac4ab9dd6fc6ae83ee1efe66b;hb=ae3093c8fb94649c33afbd4a1019b483c9d3eba0;hp=ab7649be151f5e3dd1834bf6b3c84c61712d9ae1;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index ab7649be1..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" @@ -39,6 +40,7 @@ #include "i18n.h" + using std::list; using std::cout; using std::vector; @@ -55,13 +57,13 @@ using namespace dcpomatic; using namespace boost::placeholders; #endif + Playlist::Playlist () - : _sequence (true) - , _sequencing (false) { } + Playlist::~Playlist () { boost::mutex::scoped_lock lm (_mutex); @@ -69,13 +71,14 @@ Playlist::~Playlist () disconnect (); } + void Playlist::content_change (weak_ptr weak_film, ChangeType type, weak_ptr content, int property, bool frequent) { - 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 || @@ -117,6 +120,7 @@ Playlist::content_change (weak_ptr weak_film, ChangeType type, weak_ ContentChange (type, content, property, frequent); } + void Playlist::maybe_sequence (shared_ptr film) { @@ -126,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. @@ -142,7 +146,7 @@ Playlist::maybe_sequence (shared_ptr film) 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 { @@ -171,6 +175,7 @@ Playlist::maybe_sequence (shared_ptr film) _sequencing = false; } + string Playlist::video_identifier () const { @@ -193,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. @@ -204,10 +210,10 @@ Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, in boost::mutex::scoped_lock lm (_mutex); for (auto i: node->node_children ("Content")) { - shared_ptr content = content_factory (i, version, notes); + 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."); @@ -227,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."); @@ -255,6 +261,7 @@ 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. */ @@ -266,10 +273,11 @@ Playlist::as_xml (xmlpp::Node* node, bool 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); @@ -278,22 +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,9 +315,9 @@ 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 */ @@ -316,16 +325,17 @@ Playlist::remove (shared_ptr c) LengthChange (); } + void Playlist::remove (ContentList c) { - Change (CHANGE_TYPE_PENDING); + Change (ChangeType::PENDING); { boost::mutex::scoped_lock lm (_mutex); for (auto i: c) { - ContentList::iterator j = _content.begin (); + auto j = _content.begin (); while (j != _content.end() && *j != i) { ++j; } @@ -336,13 +346,14 @@ Playlist::remove (ContentList c) } } - Change (CHANGE_TYPE_DONE); + Change (ChangeType::DONE); /* This won't change order, so it does not need a sort */ LengthChange (); } + class FrameRateCandidate { public: @@ -355,11 +366,12 @@ 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; @@ -378,7 +390,7 @@ 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; @@ -412,6 +424,7 @@ 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 @@ -424,16 +437,17 @@ Playlist::length (shared_ptr film) const 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 (); + auto start = DCPTime::max (); for (auto i: cont) { start = min (start, i->position ()); } @@ -441,6 +455,7 @@ Playlist::start () const return start; } + /** Must be called with a lock held on _mutex */ void Playlist::disconnect () @@ -452,6 +467,7 @@ Playlist::disconnect () _content_connections.clear (); } + /** Must be called with a lock held on _mutex */ void Playlist::reconnect (shared_ptr film) @@ -463,6 +479,7 @@ Playlist::reconnect (shared_ptr film) } } + DCPTime Playlist::video_end (shared_ptr film) const { @@ -476,6 +493,7 @@ Playlist::video_end (shared_ptr film) const return end; } + DCPTime Playlist::text_end (shared_ptr film) const { @@ -489,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; @@ -515,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) { @@ -539,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 @@ -547,10 +569,11 @@ Playlist::content () const return _content; } + void Playlist::repeat (shared_ptr film, ContentList c, int n) { - pair range (DCPTime::max (), DCPTime ()); + pair range (DCPTime::max(), DCPTime()); for (auto i: c) { range.first = min (range.first, i->position ()); range.second = max (range.second, i->position ()); @@ -558,7 +581,7 @@ Playlist::repeat (shared_ptr film, ContentList c, int n) range.second = max (range.second, i->end(film)); } - Change (CHANGE_TYPE_PENDING); + Change (ChangeType::PENDING); { boost::mutex::scoped_lock lm (_mutex); @@ -566,7 +589,7 @@ Playlist::repeat (shared_ptr film, ContentList c, int n) DCPTime pos = range.second; for (int i = 0; i < n; ++i) { for (auto j: c) { - shared_ptr copy = j->clone (); + auto copy = j->clone (); copy->set_position (film, pos + copy->position() - range.first); _content.push_back (copy); } @@ -577,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; @@ -596,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; } @@ -621,12 +646,13 @@ 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 { @@ -634,7 +660,7 @@ Playlist::required_disk_space (shared_ptr film, int j2k_bandwidth, i int64_t audio = uint64_t (audio_channels * audio_frame_rate * 3) * length(film).seconds(); for (auto i: content()) { - shared_ptr d = dynamic_pointer_cast (i); + auto d = dynamic_pointer_cast (i); if (d) { if (d->reference_video()) { video -= uint64_t (j2k_bandwidth / 8) * d->length_after_trim(film).seconds(); @@ -649,6 +675,7 @@ 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 { @@ -656,7 +683,7 @@ Playlist::content_summary (shared_ptr film, DCPTimePeriod period) co int best_score = -1; 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(); } @@ -674,6 +701,7 @@ Playlist::content_summary (shared_ptr film, DCPTimePeriod period) co return best_summary; } + pair Playlist::speed_up_range (int dcp_video_frame_rate) const {