X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=24a38f2cda97c45d39d63150a2ce69ca43865223;hb=2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d;hp=dc87fbfabb31702a2c18f4c4bd5469f15e6b71e7;hpb=c33fc4d10ee3a3b62ccc1b8122c791d4dfd61a60;p=dcpomatic.git diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index dc87fbfab..24a38f2cd 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2016 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,20 +17,25 @@ */ -#include -#include #include "playlist.h" #include "sndfile_content.h" #include "sndfile_decoder.h" #include "video_content.h" +#include "subtitle_content.h" #include "ffmpeg_decoder.h" #include "ffmpeg_content.h" #include "image_decoder.h" #include "content_factory.h" +#include "dcp_content.h" #include "job.h" #include "config.h" #include "util.h" #include "md5_digester.h" +#include +#include +#include +#include +#include #include "i18n.h" @@ -40,7 +45,6 @@ using std::vector; using std::min; using std::max; using std::string; -using std::stringstream; using std::pair; using boost::optional; using boost::shared_ptr; @@ -48,8 +52,8 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; Playlist::Playlist () - : _sequence_video (true) - , _sequencing_video (false) + : _sequence (true) + , _sequencing (false) { } @@ -63,54 +67,91 @@ Playlist::~Playlist () void Playlist::content_changed (weak_ptr content, int property, bool frequent) { - if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) { - maybe_sequence_video (); + if (property == ContentProperty::LENGTH || property == VideoContentProperty::FRAME_TYPE) { + /* 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. + */ + maybe_sequence (); } - + + if ( + property == ContentProperty::POSITION || + property == ContentProperty::LENGTH || + property == ContentProperty::TRIM_START || + property == ContentProperty::TRIM_END) { + + ContentList old = _content; + sort (_content.begin(), _content.end(), ContentSorter ()); + if (_content != old) { + OrderChanged (); + } + } + ContentChanged (content, property, frequent); } void -Playlist::maybe_sequence_video () +Playlist::maybe_sequence () { - if (!_sequence_video || _sequencing_video) { + if (!_sequence || _sequencing) { return; } - - _sequencing_video = true; - - ContentList cl = _content; - Time next_left = 0; - Time next_right = 0; - for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) { - shared_ptr vc = dynamic_pointer_cast (*i); - if (!vc) { + + _sequencing = true; + + /* Keep track of the content that we've set the position of so that we don't + do it twice. + */ + ContentList placed; + + /* Video */ + + DCPTime next_left; + DCPTime next_right; + BOOST_FOREACH (shared_ptr i, _content) { + if (!i->video) { continue; } - - if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { - vc->set_position (next_right); - next_right = vc->end() + 1; + + if (i->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { + i->set_position (next_right); + next_right = i->end(); } else { - vc->set_position (next_left); - next_left = vc->end() + 1; + i->set_position (next_left); + next_left = i->end(); + } + + placed.push_back (i); + } + + /* Subtitles */ + + DCPTime next; + BOOST_FOREACH (shared_ptr i, _content) { + if (!i->subtitle || find (placed.begin(), placed.end(), i) != placed.end()) { + continue; } + + i->set_position (next); + next = i->end(); } + /* This won't change order, so it does not need a sort */ - - _sequencing_video = false; + + _sequencing = false; } 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); - if (vc) { - t += vc->identifier (); + + BOOST_FOREACH (shared_ptr i, _content) { + if (i->video || (i->subtitle && i->subtitle->burn())) { + t += i->identifier (); } } @@ -121,13 +162,13 @@ Playlist::video_identifier () const /** @param node node */ void -Playlist::set_from_xml (shared_ptr film, shared_ptr node, int version, list& notes) +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)); } + /* This shouldn't be necessary but better safe than sorry (there could be old files) */ sort (_content.begin(), _content.end(), ContentSorter ()); reconnect (); @@ -137,8 +178,8 @@ Playlist::set_from_xml (shared_ptr film, shared_ptras_xml (node->add_child ("Content")); + BOOST_FOREACH (shared_ptr i, _content) { + i->as_xml (node->add_child ("Content")); } } @@ -158,7 +199,7 @@ Playlist::remove (shared_ptr c) while (i != _content.end() && *i != c) { ++i; } - + if (i != _content.end ()) { _content.erase (i); Changed (); @@ -170,33 +211,20 @@ 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 (); -} -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; + Changed (); } class FrameRateCandidate @@ -216,7 +244,7 @@ Playlist::best_dcp_frame_rate () const { list 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. */ + /* 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 */ @@ -237,14 +265,19 @@ 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); - if (!vc) { + BOOST_FOREACH (shared_ptr j, _content) { + if (!j->video || !j->video->has_own_frame_rate()) { 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 - j->video->frame_rate ())), + float (fabs (i->source - j->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) { @@ -258,21 +291,38 @@ Playlist::best_dcp_frame_rate () const if (!best) { return 24; } - + return best->dcp; } -Time +/** @return length of the playlist from time 0 to the last thing on the playlist */ +DCPTime Playlist::length () const { - Time len = 0; - for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - len = max (len, (*i)->end() + 1); + DCPTime len; + BOOST_FOREACH (shared_ptr i, _content) { + len = max (len, i->end()); } 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 (); + } + + DCPTime start = DCPTime::max (); + BOOST_FOREACH (shared_ptr i, _content) { + start = min (start, i->position ()); + } + + return start; +} + void Playlist::reconnect () { @@ -281,38 +331,82 @@ 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))); } } -Time +DCPTime Playlist::video_end () const { - Time end = 0; - for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - if (dynamic_pointer_cast (*i)) { - end = max (end, (*i)->end ()); + DCPTime end; + BOOST_FOREACH (shared_ptr i, _content) { + if (i->video) { + end = max (end, i->end ()); } } return end; } +DCPTime +Playlist::subtitle_end () const +{ + DCPTime end; + BOOST_FOREACH (shared_ptr i, _content) { + if (i->subtitle) { + end = max (end, i->end ()); + } + } + + 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) { + if (!(*i)->video) { + continue; + } + + if ((*i)->position() <= t) { + /* This is the first piece of content (going backwards...) that starts before t, + so it's the active one. + */ + return FrameRateChange ((*i)->video->frame_rate(), dcp_video_frame_rate); + } + } + + return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate); +} + void -Playlist::set_sequence_video (bool s) +Playlist::set_sequence (bool s) { - _sequence_video = s; + _sequence = s; } bool ContentSorter::operator() (shared_ptr a, shared_ptr b) { - return a->position() < b->position(); + 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 an undefined order */ +/** @return content in ascending order of position */ ContentList Playlist::content () const { @@ -322,18 +416,18 @@ Playlist::content () const void Playlist::repeat (ContentList c, int n) { - pair range (TIME_MAX, 0); - 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 ()); + pair range (DCPTime::max (), DCPTime ()); + 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 ()); } - 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 (); + BOOST_FOREACH (shared_ptr j, c) { + shared_ptr copy = j->clone (); copy->set_position (pos + copy->position() - range.first); _content.push_back (copy); } @@ -341,7 +435,7 @@ Playlist::repeat (ContentList c, int n) } sort (_content.begin(), _content.end(), ContentSorter ()); - + reconnect (); Changed (); } @@ -349,8 +443,6 @@ Playlist::repeat (ContentList c, int n) 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) { @@ -358,30 +450,27 @@ Playlist::move_earlier (shared_ptr c) ++i; } - assert (i != _content.end ()); + DCPOMATIC_ASSERT (i != _content.end ()); if (previous == _content.end ()) { return; } - - Time const p = (*previous)->position (); - (*previous)->set_position (p + c->length_after_trim ()); + + shared_ptr previous_c = *previous; + + DCPTime const p = previous_c->position (); + previous_c->set_position (p + c->length_after_trim ()); c->set_position (p); - sort (_content.begin(), _content.end(), ContentSorter ()); - - Changed (); } 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; @@ -390,27 +479,30 @@ 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 ()); - sort (_content.begin(), _content.end(), ContentSorter ()); - - Changed (); + shared_ptr next_c = *next; + + next_c->set_position (c->position ()); + c->set_position (c->position() + next_c->length_after_trim ()); } -FrameRateChange -Playlist::active_frame_rate_change (Time t, int dcp_video_frame_rate) const +int64_t +Playlist::required_disk_space (int j2k_bandwidth, int audio_channels, int audio_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); + int64_t video = uint64_t (j2k_bandwidth / 8) * length().seconds (); + int64_t audio = uint64_t (audio_channels * audio_frame_rate * 3) * length().seconds (); + + BOOST_FOREACH (shared_ptr i, _content) { + shared_ptr d = dynamic_pointer_cast (i); + if (d) { + if (d->reference_video()) { + video -= uint64_t (j2k_bandwidth / 8) * d->length_after_trim().seconds(); + } + if (d->reference_audio()) { + audio -= uint64_t (audio_channels * audio_frame_rate * 3) * d->length_after_trim().seconds(); + } } } - return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate); + /* Add on 64k for bits and pieces (metadata, subs etc) */ + return video + audio + 65536; }