X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=aa365ead4f3939c5d51264c9cc057bfbdee83a36;hb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;hp=092060fa0376a44f23403a7e296a600628bc1ece;hpb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;p=dcpomatic.git diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 092060fa0..aa365ead4 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -1,25 +1,24 @@ /* 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" @@ -30,7 +29,7 @@ #include "job.h" #include "config.h" #include "util.h" -#include "md5_digester.h" +#include "digester.h" #include #include #include @@ -67,7 +66,7 @@ Playlist::~Playlist () void Playlist::content_changed (weak_ptr content, int property, bool frequent) { - if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) { + 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 @@ -115,7 +114,7 @@ Playlist::maybe_sequence () continue; } - if (i->video->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { + if (i->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { i->set_position (next_right); next_right = i->end(); } else { @@ -150,17 +149,21 @@ Playlist::video_identifier () const string t; BOOST_FOREACH (shared_ptr i, _content) { - if (i->video || (i->subtitle && i->subtitle->burn_subtitles())) { + 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 (); } -/** @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 +177,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); } } @@ -240,7 +245,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 (); @@ -266,14 +271,14 @@ Playlist::best_dcp_frame_rate () const float this_error = 0; BOOST_FOREACH (shared_ptr j, _content) { - if (!j->video || !j->video->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 - j->video->video_frame_rate ())), - float (fabs (i->source - j->video->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" */ @@ -375,7 +380,13 @@ Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const /* This is the first piece of content (going backwards...) that starts before t, so it's the active one. */ - return FrameRateChange ((*i)->video->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); + } } } @@ -506,3 +517,40 @@ 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; +} + +bool +Playlist::video_content_at (DCPTime time) const +{ + BOOST_FOREACH (shared_ptr i, _content) { + if (i->video && i->position() <= time && time < i->end()) { + return true; + } + } + + return false; +}