X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=c830e5e1e49c3b8e83a3de969f47551853bec826;hb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb;hp=bd6abc31d0a98455bf9bfe996eec876015743d96;hpb=f36136e70efbc19255142319a1676f25fa55f780;p=dcpomatic.git diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index bd6abc31d..c830e5e1e 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -1,36 +1,36 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2018 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 "text_content.h" #include "ffmpeg_decoder.h" #include "ffmpeg_content.h" #include "image_decoder.h" +#include "audio_content.h" #include "content_factory.h" #include "dcp_content.h" #include "job.h" #include "config.h" #include "util.h" -#include "md5_digester.h" +#include "digester.h" #include #include #include @@ -67,7 +67,12 @@ Playlist::~Playlist () void Playlist::content_changed (weak_ptr content, int property, bool frequent) { - if (property == ContentProperty::LENGTH || property == VideoContentProperty::FRAME_TYPE) { + if ( + property == ContentProperty::TRIM_START || + property == ContentProperty::TRIM_END || + 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 @@ -126,11 +131,11 @@ Playlist::maybe_sequence () placed.push_back (i); } - /* Subtitles */ + /* Captions */ DCPTime next; BOOST_FOREACH (shared_ptr i, _content) { - if (!i->subtitle || find (placed.begin(), placed.end(), i) != placed.end()) { + if (i->text.empty() || find (placed.begin(), placed.end(), i) != placed.end()) { continue; } @@ -150,17 +155,27 @@ Playlist::video_identifier () const string t; BOOST_FOREACH (shared_ptr i, _content) { - if (i->video || (i->subtitle && i->subtitle->burn())) { + bool burn = false; + BOOST_FOREACH (shared_ptr j, i->text) { + if (j->burn()) { + burn = true; + } + } + if (i->video || burn) { t += i->identifier (); } } - MD5Digester digester; + Digester digester; digester.add (t.c_str(), t.length()); return digester.get (); } -/** @param node node */ +/** @param film Film that this Playlist is for. + * @param node <Playlist> node. + * @param version Metadata version number. + * @param notes Output notes about that happened. + */ void Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, int version, list& notes) { @@ -174,12 +189,14 @@ Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, in reconnect (); } -/** @param node node */ +/** @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) +Playlist::as_xml (xmlpp::Node* node, bool with_content_paths) { BOOST_FOREACH (shared_ptr i, _content) { - i->as_xml (node->add_child ("Content")); + i->as_xml (node->add_child ("Content"), with_content_paths); } } @@ -351,11 +368,11 @@ Playlist::video_end () const } DCPTime -Playlist::subtitle_end () const +Playlist::text_end () const { DCPTime end; BOOST_FOREACH (shared_ptr i, _content) { - if (i->subtitle) { + if (!i->text.empty ()) { end = max (end, i->end ()); } } @@ -512,3 +529,51 @@ Playlist::required_disk_space (int j2k_bandwidth, int audio_channels, int audio_ /* Add on 64k for bits and pieces (metadata, subs etc) */ return video + audio + 65536; } + +string +Playlist::content_summary (DCPTimePeriod period) const +{ + string best_summary; + int best_score = -1; + BOOST_FOREACH (shared_ptr i, _content) { + int score = 0; + optional const o = DCPTimePeriod(i->position(), i->end()).overlap (period); + if (o) { + score += 100 * o.get().duration().get() / period.duration().get(); + } + + if (i->video) { + score += 100; + } + + if (score > best_score) { + best_summary = i->path(0).leaf().string(); + best_score = score; + } + } + + 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) { + if (!i->video) { + continue; + } + if (i->video_frame_rate()) { + FrameRateChange const frc (i->video_frame_rate().get(), dcp_video_frame_rate); + range.first = min (range.first, frc.speed_up); + range.second = max (range.second, frc.speed_up); + } else { + FrameRateChange const frc (dcp_video_frame_rate, dcp_video_frame_rate); + range.first = min (range.first, frc.speed_up); + range.second = max (range.second, frc.speed_up); + } + } + + return range; +}