X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=739c5a20b3d0317f506786ce8dbc4fd544a91bab;hb=a306df9145d16046e51e8b7ff5222e341e98fdbd;hp=1eaef3a51fffed13eab34d7c7ce12e7ee20c59a8;hpb=7ab80b672a5e7d0ec8ad5dccda7503c04d40ffb5;p=dcpomatic.git diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 1eaef3a51..739c5a20b 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -1,26 +1,26 @@ /* Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #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" @@ -29,7 +29,7 @@ #include "job.h" #include "config.h" #include "util.h" -#include "md5_digester.h" +#include "digester.h" #include #include #include @@ -51,8 +51,8 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; Playlist::Playlist () - : _sequence_video (true) - , _sequencing_video (false) + : _sequence (true) + , _sequencing (false) { } @@ -66,48 +66,81 @@ 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::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::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) { - maybe_sequence_video (); + 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; + _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) { - shared_ptr vc = dynamic_pointer_cast (i); - if (!vc) { + if (!i->video) { continue; } - if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { - vc->set_position (next_right); - next_right = vc->end(); + 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(); + 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 @@ -116,16 +149,12 @@ Playlist::video_identifier () const string t; 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 (); + if (i->video || (i->subtitle && i->subtitle->burn())) { + t += i->identifier (); } } - MD5Digester digester; + Digester digester; digester.add (t.c_str(), t.length()); return digester.get (); } @@ -138,6 +167,7 @@ Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, in _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 (); @@ -209,7 +239,7 @@ public: }; int -Playlist::best_dcp_frame_rate () const +Playlist::best_video_frame_rate () const { list const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates (); @@ -235,15 +265,14 @@ Playlist::best_dcp_frame_rate () const float this_error = 0; BOOST_FOREACH (shared_ptr j, _content) { - shared_ptr vc = dynamic_pointer_cast (j); - if (!vc || !vc->has_own_video_frame_rate()) { + if (!j->video || !j->video_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 - vc->video_frame_rate ())), - float (fabs (i->source - vc->video_frame_rate () * 2)) + float (fabs (i->source - j->video_frame_rate().get())), + float (fabs (i->source - j->video_frame_rate().get() * 2)) ); /* Use the largest difference between DCP and source as the "error" */ @@ -312,7 +341,20 @@ Playlist::video_end () const { DCPTime end; BOOST_FOREACH (shared_ptr i, _content) { - if (dynamic_pointer_cast (i)) { + 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 ()); } } @@ -324,16 +366,21 @@ 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) { - shared_ptr vc = dynamic_pointer_cast (*i); - if (!vc) { + if (!(*i)->video) { continue; } - if (vc->position() <= t) { + 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 (vc->video_frame_rate(), dcp_video_frame_rate); + if ((*i)->video_frame_rate ()) { + /* This content specified a rate, so use it */ + return FrameRateChange ((*i)->video_frame_rate().get(), dcp_video_frame_rate); + } else { + /* No specified rate so just use the DCP one */ + return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate); + } } } @@ -341,15 +388,27 @@ Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const } 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 ascending order of position */ @@ -389,8 +448,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) { @@ -403,18 +460,16 @@ Playlist::move_earlier (shared_ptr c) return; } + shared_ptr previous_c = *previous; - DCPTime const p = (*previous)->position (); - (*previous)->set_position (p + c->length_after_trim ()); + 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 ()); } 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; @@ -429,9 +484,10 @@ Playlist::move_later (shared_ptr c) return; } - (*next)->set_position (c->position ()); - c->set_position (c->position() + (*next)->length_after_trim ()); - sort (_content.begin(), _content.end(), ContentSorter ()); + shared_ptr next_c = *next; + + next_c->set_position (c->position ()); + c->set_position (c->position() + next_c->length_after_trim ()); } int64_t