X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=c18a438821b9a91fd0e4e23b7d629363e81216f0;hp=f530d2ee3826d5eead2b4c1b061f96184b7118be;hb=HEAD;hpb=ed227b4fdba9b4fc7f06f6db4830219f14bad358 diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index f530d2ee3..85957e106 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,67 +18,83 @@ */ -#include "playlist.h" -#include "video_content.h" -#include "text_content.h" -#include "ffmpeg_decoder.h" -#include "ffmpeg_content.h" -#include "image_decoder.h" + #include "audio_content.h" +#include "compose.hpp" +#include "config.h" #include "content_factory.h" #include "dcp_content.h" +#include "digester.h" +#include "ffmpeg_content.h" +#include "ffmpeg_decoder.h" +#include "image_decoder.h" #include "job.h" -#include "config.h" +#include "playlist.h" +#include "text_content.h" #include "util.h" -#include "digester.h" -#include "compose.hpp" +#include "video_content.h" #include #include -#include -#include +#include #include #include "i18n.h" -using std::list; + using std::cout; -using std::vector; -using std::min; +using std::dynamic_pointer_cast; +using std::list; using std::max; -using std::string; +using std::min; using std::pair; +using std::shared_ptr; +using std::string; +using std::vector; +using std::weak_ptr; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + -Playlist::Playlist () - : _sequence (true) - , _sequencing (false) +class ContentSorter { +public: + bool operator()(shared_ptr a, shared_ptr b) + { + if (a->position() != b->position()) { + return a->position() < b->position(); + } + + /* Put video before audio if they start at the same time */ + if (a->video && !b->video) { + return true; + } else if (!a->video && b->video) { + return false; + } + + /* Last resort */ + return a->digest() < b->digest(); + } +}; -} Playlist::~Playlist () { + boost::mutex::scoped_lock lm (_mutex); _content.clear (); 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 || @@ -99,17 +115,28 @@ Playlist::content_change (weak_ptr weak_film, ChangeType type, weak_ property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END) { - ContentList old = _content; - sort (_content.begin(), _content.end(), ContentSorter ()); - if (_content != old) { - OrderChanged (); + bool changed = false; + + { + boost::mutex::scoped_lock lm (_mutex); + ContentList old = _content; + sort (_content.begin(), _content.end(), ContentSorter ()); + changed = _content != old; } + + if (changed) { + 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) { @@ -119,6 +146,8 @@ Playlist::maybe_sequence (shared_ptr film) _sequencing = true; + auto cont = content (); + /* Keep track of the content that we've set the position of so that we don't do it twice. */ @@ -128,12 +157,12 @@ Playlist::maybe_sequence (shared_ptr film) DCPTime next_left; DCPTime next_right; - BOOST_FOREACH (shared_ptr i, _content) { + 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 { @@ -147,7 +176,7 @@ Playlist::maybe_sequence (shared_ptr film) /* Captions */ DCPTime next; - BOOST_FOREACH (shared_ptr i, _content) { + for (auto i: cont) { if (i->text.empty() || find (placed.begin(), placed.end(), i) != placed.end()) { continue; } @@ -162,14 +191,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; } @@ -184,6 +214,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. @@ -192,11 +223,13 @@ Playlist::video_identifier () const void Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, int version, list& notes) { - BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Content")) { - shared_ptr content = content_factory (i, version, notes); + boost::mutex::scoped_lock lm (_mutex); + + 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."); @@ -216,8 +249,8 @@ 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(); - content->set_trim_start(old_trim); + auto const old_trim = content->trim_start(); + content->set_trim_start(film, old_trim); if (old_trim != content->trim_start()) { string note = _("Your project contains video content whose trim was not aligned to a frame boundary."); note += " "; @@ -244,68 +277,99 @@ 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); - _content.push_back (c); - sort (_content.begin(), _content.end(), ContentSorter ()); - reconnect (film); - Change (CHANGE_TYPE_DONE); + Change (ChangeType::PENDING); + + { + boost::mutex::scoped_lock lm (_mutex); + _content.push_back (c); + sort (_content.begin(), _content.end(), ContentSorter ()); + reconnect (film); + } + + Change (ChangeType::DONE); + + LengthChange (); } + void Playlist::remove (shared_ptr c) { - Change (CHANGE_TYPE_PENDING); + Change (ChangeType::PENDING); - ContentList::iterator i = _content.begin (); - while (i != _content.end() && *i != c) { - ++i; + bool cancelled = false; + + { + boost::mutex::scoped_lock lm (_mutex); + + auto i = _content.begin (); + while (i != _content.end() && *i != c) { + ++i; + } + + if (i != _content.end()) { + _content.erase (i); + } else { + cancelled = true; + } } - if (i != _content.end ()) { - _content.erase (i); - Change (CHANGE_TYPE_DONE); + if (cancelled) { + Change (ChangeType::CANCELLED); } else { - Change (CHANGE_TYPE_CANCELLED); + 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_FOREACH (shared_ptr i, c) { - ContentList::iterator j = _content.begin (); - while (j != _content.end() && *j != i) { - ++j; - } + { + boost::mutex::scoped_lock lm (_mutex); - if (j != _content.end ()) { - _content.erase (j); + for (auto i: c) { + auto j = _content.begin (); + while (j != _content.end() && *j != i) { + ++j; + } + + if (j != _content.end ()) { + _content.erase (j); + } } } + Change (ChangeType::DONE); + /* This won't change order, so it does not need a sort */ - Change (CHANGE_TYPE_DONE); + LengthChange (); } + class FrameRateCandidate { public: @@ -318,33 +382,35 @@ 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 */ - for (list::const_iterator i = allowed_dcp_frame_rates.begin(); i != allowed_dcp_frame_rates.end(); ++i) { - candidates.push_back (FrameRateCandidate (*i, *i)); + for (auto i: allowed_dcp_frame_rates) { + candidates.push_back (FrameRateCandidate(i, i)); } /* Then the skip/repeat ones */ - for (list::const_iterator i = allowed_dcp_frame_rates.begin(); i != allowed_dcp_frame_rates.end(); ++i) { - candidates.push_back (FrameRateCandidate (float (*i) / 2, *i)); - candidates.push_back (FrameRateCandidate (float (*i) * 2, *i)); + for (auto i: allowed_dcp_frame_rates) { + candidates.push_back (FrameRateCandidate (float(i) / 2, i)); + candidates.push_back (FrameRateCandidate (float(i) * 2, i)); } /* 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; } @@ -374,59 +440,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 { - if (_content.empty ()) { - return optional (); + auto cont = content (); + if (cont.empty()) { + return {}; } - DCPTime start = DCPTime::max (); - BOOST_FOREACH (shared_ptr i, _content) { + 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 () { - for (list::iterator i = _content_connections.begin(); i != _content_connections.end(); ++i) { - i->disconnect (); + 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)); } @@ -435,11 +509,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)); } @@ -448,10 +523,12 @@ Playlist::text_end (shared_ptr film) const return end; } + FrameRateChange Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const { - for (ContentList::const_reverse_iterator i = _content.rbegin(); i != _content.rend(); ++i) { + auto cont = content (); + for (ContentList::const_reverse_iterator i = cont.rbegin(); i != cont.rend(); ++i) { if (!(*i)->video) { continue; } @@ -473,125 +550,114 @@ 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) -{ - if (a->position() != b->position()) { - return a->position() < b->position(); - } - - /* Put video before audio if they start at the same time */ - if (a->video && !b->video) { - return true; - } else if (!a->video && b->video) { - return false; - } - - /* Last resort */ - return a->digest() < b->digest(); -} /** @return content in ascending order of position */ ContentList Playlist::content () const { + boost::mutex::scoped_lock lm (_mutex); 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 (); - copy->set_position (film, pos + copy->position() - range.first); - _content.push_back (copy); + DCPTime pos = range.second; + for (int i = 0; i < n; ++i) { + for (auto j: c) { + auto copy = j->clone (); + copy->set_position (film, pos + copy->position() - range.first); + _content.push_back (copy); + } + pos += range.second - range.first; } - pos += range.second - range.first; - } - sort (_content.begin(), _content.end(), ContentSorter ()); + sort (_content.begin(), _content.end(), ContentSorter ()); + reconnect (film); + } - reconnect (film); - Change (CHANGE_TYPE_DONE); + Change (ChangeType::DONE); } + void Playlist::move_earlier (shared_ptr film, shared_ptr c) { - ContentList::iterator previous = _content.end (); - ContentList::iterator i = _content.begin(); - while (i != _content.end() && *i != c) { + auto cont = content (); + auto previous = cont.end(); + auto i = cont.begin(); + while (i != cont.end() && *i != c) { previous = i; ++i; } - DCPOMATIC_ASSERT (i != _content.end ()); - if (previous == _content.end ()) { + DCPOMATIC_ASSERT (i != cont.end()); + if (previous == cont.end()) { 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::iterator i = _content.begin(); - while (i != _content.end() && *i != c) { - ++i; - } - - DCPOMATIC_ASSERT (i != _content.end ()); + auto cont = content (); - ContentList::iterator next = i; - ++next; + auto iter = std::find(cont.begin(), cont.end(), c); + DCPOMATIC_ASSERT(iter != cont.end()); - if (next == _content.end ()) { + ContentList::iterator next = std::next(iter); + if (next == cont.end()) { + /* This content is already at the end */ return; } - shared_ptr next_c = *next; - - next_c->set_position (film, c->position()); - c->set_position (film, c->position() + next_c->length_after_trim(film)); + (*next)->set_position(film, c->position()); + c->set_position(film, c->position() + (*next)->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(); + 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(); } if (d->reference_audio()) { - audio -= uint64_t (audio_channels * audio_frame_rate * 3) * d->length_after_trim(film).seconds(); + audio -= uint64_t(audio_channels) * audio_frame_rate * 3 * d->length_after_trim(film).seconds(); } } } @@ -600,14 +666,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 = i->period(film).overlap(period); if (o) { score += 100 * o.get().duration().get() / period.duration().get(); } @@ -617,7 +684,7 @@ Playlist::content_summary (shared_ptr film, DCPTimePeriod period) co } if (score > best_score) { - best_summary = i->path(0).leaf().string(); + best_summary = i->path(0).filename().string(); best_score = score; } } @@ -625,12 +692,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; }