X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=6b3625d9e727d34faec4effa67da7304aa1d832f;hp=e48b08f3b70b7216b6035c7750b22df3cdbcd942;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=4704d088ae03ab2b5f73ceed577fd84935ad0640 diff --git a/src/lib/film.cc b/src/lib/film.cc index e48b08f3b..6b3625d9e 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-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 . */ @@ -48,6 +49,9 @@ #include "video_content.h" #include "subtitle_content.h" #include "ffmpeg_content.h" +#include "dcp_content.h" +#include "screen_kdm.h" +#include "cinema.h" #include #include #include @@ -78,14 +82,15 @@ using std::make_pair; using std::cout; using std::list; using std::set; +using std::runtime_error; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; using boost::is_any_of; -#define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); -#define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, Log::TYPE_GENERAL); +#define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); +#define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL); /* 5 -> 6 * AudioMapping XML changed. @@ -100,8 +105,11 @@ using boost::is_any_of; * * Bumped to 32 for 2.0 branch; some times are expressed in Times rather * than frames now. + * + * 32 -> 33 + * Changed to in FFmpegSubtitleStream */ -int const Film::current_state_version = 32; +int const Film::current_state_version = 33; /** Construct a Film object in a given directory. * @@ -121,19 +129,24 @@ Film::Film (boost::filesystem::path dir, bool log) , _video_frame_rate (24) , _audio_channels (6) , _three_d (false) - , _sequence_video (true) - , _interop (false) + , _sequence (true) + , _interop (Config::instance()->default_interop ()) , _audio_processor (0) + , _reel_type (REELTYPE_SINGLE) + , _reel_length (2000000000) + , _upload_after_make_dcp (false) , _state_version (current_state_version) , _dirty (false) { set_isdcf_date_today (); _playlist_changed_connection = _playlist->Changed.connect (bind (&Film::playlist_changed, this)); + _playlist_order_changed_connection = _playlist->OrderChanged.connect (bind (&Film::playlist_order_changed, this)); _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2, _3)); /* Make state.directory a complete path without ..s (where possible) (Code swiped from Adam Bowen on stackoverflow) + XXX: couldn't/shouldn't this just be boost::filesystem::canonical? */ boost::filesystem::path p (boost::filesystem::system_complete (dir)); @@ -157,7 +170,7 @@ Film::Film (boost::filesystem::path dir, bool log) _log.reset (new NullLog); } - _playlist->set_sequence_video (_sequence_video); + _playlist->set_sequence (_sequence); } Film::~Film () @@ -206,11 +219,11 @@ Film::video_identifier () const /** @return The file to write video frame info to */ boost::filesystem::path -Film::info_file () const +Film::info_file (DCPTimePeriod period) const { boost::filesystem::path p; p /= "info"; - p /= video_identifier (); + p /= video_identifier () + "_" + raw_convert (period.from.get()) + "_" + raw_convert (period.to.get()); return file (p); } @@ -221,9 +234,9 @@ Film::internal_video_asset_dir () const } boost::filesystem::path -Film::internal_video_asset_filename () const +Film::internal_video_asset_filename (DCPTimePeriod p) const { - return video_identifier() + ".mxf"; + return video_identifier() + "_" + raw_convert (p.from.get()) + "_" + raw_convert (p.to.get()) + ".mxf"; } boost::filesystem::path @@ -233,13 +246,12 @@ Film::audio_analysis_path (shared_ptr playlist) const MD5Digester digester; BOOST_FOREACH (shared_ptr i, playlist->content ()) { - shared_ptr ac = dynamic_pointer_cast (i); - if (!ac) { + if (!i->audio) { continue; } - digester.add (ac->digest ()); - digester.add (ac->audio_mapping().digest ()); + digester.add (i->digest ()); + digester.add (i->audio->mapping().digest ()); if (playlist->content().size() != 1) { /* Analyses should be considered equal regardless of gain if they were made from just one piece of content. This @@ -247,7 +259,7 @@ Film::audio_analysis_path (shared_ptr playlist) const analysis at the plotting stage rather than having to recompute it. */ - digester.add (ac->audio_gain ()); + digester.add (i->audio->gain ()); } } @@ -269,7 +281,9 @@ Film::make_dcp () set_isdcf_date_today (); - environment_info (log ()); + BOOST_FOREACH (string i, environment_info ()) { + LOG_GENERAL_NC (i); + } BOOST_FOREACH (shared_ptr i, content ()) { LOG_GENERAL ("Content: %1", i->technical_summary()); @@ -287,7 +301,7 @@ Film::make_dcp () } if (content().empty()) { - throw StringError (_("You must add some content to the DCP before creating it")); + throw runtime_error (_("You must add some content to the DCP before creating it")); } if (dcp_content_type() == 0) { @@ -334,7 +348,7 @@ Film::metadata () const root->add_child("ISDCFDate")->add_child_text (boost::gregorian::to_iso_string (_isdcf_date)); root->add_child("AudioChannels")->add_child_text (raw_convert (_audio_channels)); root->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0"); - root->add_child("SequenceVideo")->add_child_text (_sequence_video ? "1" : "0"); + root->add_child("Sequence")->add_child_text (_sequence ? "1" : "0"); root->add_child("Interop")->add_child_text (_interop ? "1" : "0"); root->add_child("Signed")->add_child_text (_signed ? "1" : "0"); root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0"); @@ -342,6 +356,9 @@ Film::metadata () const if (_audio_processor) { root->add_child("AudioProcessor")->add_child_text (_audio_processor->id ()); } + root->add_child("ReelType")->add_child_text (raw_convert (_reel_type)); + root->add_child("ReelLength")->add_child_text (raw_convert (_reel_length)); + root->add_child("UploadAfterMakeDCP")->add_child_text (_upload_after_make_dcp ? "1" : "0"); _playlist->as_xml (root->add_child ("Playlist")); return doc; @@ -364,7 +381,7 @@ list Film::read_metadata () { if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file ("metadata.xml"))) { - throw StringError (_("This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version. You will need to create a new Film, re-add your content and set it up again. Sorry!")); + throw runtime_error (_("This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version. You will need to create a new Film, re-add your content and set it up again. Sorry!")); } cxml::Document f ("Metadata"); @@ -372,7 +389,7 @@ Film::read_metadata () _state_version = f.number_child ("Version"); if (_state_version > current_state_version) { - throw StringError (_("This film was created with a newer version of DCP-o-matic, and it cannot be loaded into this version. Sorry!")); + throw runtime_error (_("This film was created with a newer version of DCP-o-matic, and it cannot be loaded into this version. Sorry!")); } _name = f.string_child ("Name"); @@ -414,7 +431,13 @@ Film::read_metadata () } else if ((_audio_channels % 2) == 1) { _audio_channels++; } - _sequence_video = f.bool_child ("SequenceVideo"); + + if (f.optional_bool_child("SequenceVideo")) { + _sequence = f.bool_child("SequenceVideo"); + } else { + _sequence = f.bool_child("Sequence"); + } + _three_d = f.bool_child ("ThreeD"); _interop = f.bool_child ("Interop"); _key = dcp::Key (f.string_child ("Key")); @@ -425,6 +448,10 @@ Film::read_metadata () _audio_processor = 0; } + _reel_type = static_cast (f.optional_number_child("ReelType").get_value_or (static_cast(REELTYPE_SINGLE))); + _reel_length = f.optional_number_child("ReelLength").get_value_or (2000000000); + _upload_after_make_dcp = f.optional_bool_child("UploadAfterMakeDCP").get_value_or (false); + list notes; /* This method is the only one that can return notes (so far) */ _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes); @@ -466,6 +493,31 @@ Film::file (boost::filesystem::path f) const return p; } +list +Film::mapped_audio_channels () const +{ + list mapped; + + if (audio_processor ()) { + /* Processors are mapped 1:1 to DCP outputs so we can work out mappings from there */ + for (int i = 0; i < audio_processor()->out_channels(); ++i) { + mapped.push_back (i); + } + } else { + BOOST_FOREACH (shared_ptr i, content ()) { + if (i->audio) { + list c = i->audio->mapping().mapped_output_channels (); + copy (c.begin(), c.end(), back_inserter (mapped)); + } + } + + mapped.sort (); + mapped.unique (); + } + + return mapped; +} + /** @return a ISDCF-compliant name for a DCP of this film */ string Film::isdcf_name (bool if_created_now) const @@ -564,13 +616,12 @@ Film::isdcf_name (bool if_created_now) const if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::TRAILER) { Ratio const * content_ratio = 0; BOOST_FOREACH (shared_ptr i, content ()) { - shared_ptr vc = dynamic_pointer_cast (i); - if (vc) { + if (i->video) { /* Here's the first piece of video content */ - if (vc->scale().ratio ()) { - content_ratio = vc->scale().ratio (); + if (i->video->scale().ratio ()) { + content_ratio = i->video->scale().ratio (); } else { - content_ratio = Ratio::from_ratio (vc->video_size().ratio ()); + content_ratio = Ratio::from_ratio (i->video->size().ratio ()); } break; } @@ -584,7 +635,26 @@ Film::isdcf_name (bool if_created_now) const if (!dm.audio_language.empty ()) { d << "_" << dm.audio_language; if (!dm.subtitle_language.empty()) { - d << "-" << dm.subtitle_language; + + bool burnt_in = true; + BOOST_FOREACH (shared_ptr i, content ()) { + if (!i->subtitle) { + continue; + } + + if (i->subtitle->use() && !i->subtitle->burn()) { + burnt_in = false; + } + } + + string language = dm.subtitle_language; + if (burnt_in && language != "XX") { + transform (language.begin(), language.end(), language.begin(), ::tolower); + } else { + transform (language.begin(), language.end(), language.begin(), ::toupper); + } + + d << "-" << language; } else { d << "-XX"; } @@ -599,46 +669,21 @@ Film::isdcf_name (bool if_created_now) const } } - /* Find all mapped channels */ + /* Count mapped audio channels */ int non_lfe = 0; int lfe = 0; - if (audio_processor ()) { - /* Processors are mapped 1:1 to DCP outputs so we can guess the number of LFE/ - non-LFE from the channel counts. - */ - non_lfe = audio_processor()->out_channels (); - if (non_lfe >= 4) { - --non_lfe; - ++lfe; - } - } else { - list mapped; - BOOST_FOREACH (shared_ptr i, content ()) { - shared_ptr ac = dynamic_pointer_cast (i); - if (ac) { - list c = ac->audio_mapping().mapped_output_channels (); - copy (c.begin(), c.end(), back_inserter (mapped)); - } + BOOST_FOREACH (int i, mapped_audio_channels ()) { + if (i >= audio_channels()) { + /* This channel is mapped but is not included in the DCP */ + continue; } - mapped.sort (); - mapped.unique (); - - /* Count them */ - - for (list::const_iterator i = mapped.begin(); i != mapped.end(); ++i) { - if (*i >= audio_channels()) { - /* This channel is mapped but is not included in the DCP */ - continue; - } - - if (static_cast (*i) == dcp::LFE) { - ++lfe; - } else { - ++non_lfe; - } + if (static_cast (i) == dcp::LFE) { + ++lfe; + } else { + ++non_lfe; } } @@ -674,8 +719,18 @@ Film::isdcf_name (bool if_created_now) const d << "-3D"; } - if (!dm.package_type.empty ()) { - d << "_" << dm.package_type; + bool vf = false; + BOOST_FOREACH (shared_ptr i, content ()) { + shared_ptr dc = dynamic_pointer_cast (i); + if (dc && (dc->reference_video() || dc->reference_audio() || dc->reference_subtitle())) { + vf = true; + } + } + + if (vf) { + d << "_VF"; + } else { + d << "_OV"; } return d.str (); @@ -804,6 +859,28 @@ Film::set_audio_processor (AudioProcessor const * processor) signal_changed (AUDIO_CHANNELS); } +void +Film::set_reel_type (ReelType t) +{ + _reel_type = t; + signal_changed (REEL_TYPE); +} + +/** @param r Desired reel length in bytes */ +void +Film::set_reel_length (int64_t r) +{ + _reel_length = r; + signal_changed (REEL_LENGTH); +} + +void +Film::set_upload_after_make_dcp (bool u) +{ + _upload_after_make_dcp = u; + signal_changed (UPLOAD_AFTER_MAKE_DCP); +} + void Film::signal_changed (Property p) { @@ -811,11 +888,11 @@ Film::signal_changed (Property p) switch (p) { case Film::CONTENT: - set_video_frame_rate (_playlist->best_dcp_frame_rate ()); + set_video_frame_rate (_playlist->best_video_frame_rate ()); break; case Film::VIDEO_FRAME_RATE: - case Film::SEQUENCE_VIDEO: - _playlist->maybe_sequence_video (); + case Film::SEQUENCE: + _playlist->maybe_sequence (); break; default: break; @@ -831,7 +908,7 @@ Film::set_isdcf_date_today () } boost::filesystem::path -Film::j2c_path (int f, Eyes e, bool t) const +Film::j2c_path (int reel, Frame frame, Eyes eyes, bool tmp) const { boost::filesystem::path p; p /= "j2c"; @@ -839,17 +916,17 @@ Film::j2c_path (int f, Eyes e, bool t) const SafeStringStream s; s.width (8); - s << setfill('0') << f; + s << setfill('0') << reel << "_" << frame; - if (e == EYES_LEFT) { + if (eyes == EYES_LEFT) { s << ".L"; - } else if (e == EYES_RIGHT) { + } else if (eyes == EYES_RIGHT) { s << ".R"; } s << ".j2c"; - if (t) { + if (tmp) { s << ".tmp"; } @@ -954,7 +1031,7 @@ Film::maybe_add_content (weak_ptr j, weak_ptr c) } add_content (content); - if (Config::instance()->automatic_audio_analysis ()) { + if (Config::instance()->automatic_audio_analysis() && content->audio) { shared_ptr playlist (new Playlist); playlist->add (content); boost::signals2::connection c; @@ -968,9 +1045,11 @@ Film::maybe_add_content (weak_ptr j, weak_ptr c) void Film::add_content (shared_ptr c) { - /* Add video content after any existing content */ - if (dynamic_pointer_cast (c)) { + /* Add {video,subtitle} content after any existing {video,subtitle} content */ + if (c->video) { c->set_position (_playlist->video_end ()); + } else if (c->subtitle) { + c->set_position (_playlist->subtitle_end ()); } _playlist->add (c); @@ -994,6 +1073,7 @@ Film::move_content_later (shared_ptr c) _playlist->move_later (c); } +/** @return length of the film from time 0 to the last thing on the playlist */ DCPTime Film::length () const { @@ -1003,7 +1083,7 @@ Film::length () const int Film::best_video_frame_rate () const { - return _playlist->best_dcp_frame_rate (); + return _playlist->best_video_frame_rate (); } FrameRateChange @@ -1017,9 +1097,9 @@ Film::playlist_content_changed (weak_ptr c, int p, bool frequent) { _dirty = true; - if (p == VideoContentProperty::VIDEO_FRAME_RATE) { - set_video_frame_rate (_playlist->best_dcp_frame_rate ()); - } else if (p == AudioContentProperty::AUDIO_STREAMS) { + if (p == ContentProperty::VIDEO_FRAME_RATE) { + set_video_frame_rate (_playlist->best_video_frame_rate ()); + } else if (p == AudioContentProperty::STREAMS) { signal_changed (NAME); } @@ -1033,12 +1113,17 @@ Film::playlist_changed () signal_changed (NAME); } +void +Film::playlist_order_changed () +{ + signal_changed (CONTENT_ORDER); +} + int Film::audio_frame_rate () const { BOOST_FOREACH (shared_ptr i, content ()) { - shared_ptr a = dynamic_pointer_cast (i); - if (a && a->has_rate_above_48k ()) { + if (i->audio && i->audio->has_rate_above_48k ()) { return 96000; } } @@ -1047,11 +1132,11 @@ Film::audio_frame_rate () const } void -Film::set_sequence_video (bool s) +Film::set_sequence (bool s) { - _sequence_video = s; - _playlist->set_sequence_video (s); - signal_changed (SEQUENCE_VIDEO); + _sequence = s; + _playlist->set_sequence (s); + signal_changed (SEQUENCE); } /** @return Size of the largest possible image in whatever resolution we are using */ @@ -1076,9 +1161,13 @@ Film::frame_size () const return fit_ratio_within (container()->ratio(), full_frame ()); } +/** @param from KDM from time expressed as a local time with an offset from UTC + * @param to KDM to time expressed as a local time with an offset from UTC + */ dcp::EncryptedKDM Film::make_kdm ( - dcp::Certificate target, + dcp::Certificate recipient, + vector trusted_devices, boost::filesystem::path cpl_file, dcp::LocalTime from, dcp::LocalTime until, @@ -1092,24 +1181,36 @@ Film::make_kdm ( } return dcp::DecryptedKDM ( - cpl, key(), from, until, "DCP-o-matic", cpl->content_title_text(), dcp::LocalTime().as_string() - ).encrypt (signer, target, formulation); + cpl, key(), from, until, cpl->content_title_text(), cpl->content_title_text(), dcp::LocalTime().as_string() + ).encrypt (signer, recipient, trusted_devices, formulation); } -list +/** @param from KDM from time expressed as a local time in the time zone of the Screen's Cinema. + * @param to KDM to time expressed as a local time in the time zone of the Screen's Cinema. + */ +list Film::make_kdms ( list > screens, boost::filesystem::path dcp, - dcp::LocalTime from, - dcp::LocalTime until, + boost::posix_time::ptime from, + boost::posix_time::ptime until, dcp::Formulation formulation ) const { - list kdms; - - for (list >::iterator i = screens.begin(); i != screens.end(); ++i) { - if ((*i)->certificate) { - kdms.push_back (make_kdm ((*i)->certificate.get(), dcp, from, until, formulation)); + list kdms; + + BOOST_FOREACH (shared_ptr i, screens) { + if (i->recipient) { + dcp::EncryptedKDM const kdm = make_kdm ( + i->recipient.get(), + i->trusted_devices, + dcp, + dcp::LocalTime (from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), + dcp::LocalTime (until, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), + formulation + ); + + kdms.push_back (ScreenKDM (i, kdm)); } } @@ -1122,12 +1223,12 @@ Film::make_kdms ( uint64_t Film::required_disk_space () const { - return uint64_t (j2k_bandwidth() / 8) * length().seconds(); + return _playlist->required_disk_space (j2k_bandwidth(), audio_channels(), audio_frame_rate()); } /** This method checks the disk that the Film is on and tries to decide whether or not * there will be enough space to make a DCP for it. If so, true is returned; if not, - * false is returned and required and availabe are filled in with the amount of disk space + * false is returned and required and available are filled in with the amount of disk space * required and available respectively (in Gb). * * Note: the decision made by this method isn't, of course, 100% reliable. @@ -1167,9 +1268,8 @@ Film::subtitle_language () const ContentList cl = content (); BOOST_FOREACH (shared_ptr& c, cl) { - shared_ptr sc = dynamic_pointer_cast (c); - if (sc) { - languages.insert (sc->subtitle_language ()); + if (c->subtitle) { + languages.insert (c->subtitle->language ()); } } @@ -1218,6 +1318,8 @@ Film::audio_output_names () const return audio_processor()->input_names (); } + DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16); + vector n; n.push_back (_("L")); n.push_back (_("R")); @@ -1231,6 +1333,10 @@ Film::audio_output_names () const n.push_back (_("Rc")); n.push_back (_("BsL")); n.push_back (_("BsR")); + n.push_back (_("DBP")); + n.push_back (_("DBS")); + n.push_back (""); + n.push_back (""); return vector (n.begin(), n.begin() + audio_channels ()); } @@ -1252,3 +1358,59 @@ Film::audio_analysis_finished () { /* XXX */ } + +list +Film::reels () const +{ + list p; + DCPTime const len = length().round_up (video_frame_rate ()); + + switch (reel_type ()) { + case REELTYPE_SINGLE: + p.push_back (DCPTimePeriod (DCPTime (), len)); + break; + case REELTYPE_BY_VIDEO_CONTENT: + { + optional last_split; + shared_ptr last_video; + ContentList cl = content (); + BOOST_FOREACH (shared_ptr c, content ()) { + if (c->video) { + BOOST_FOREACH (DCPTime t, c->reel_split_points()) { + if (last_split) { + p.push_back (DCPTimePeriod (last_split.get(), t)); + } + last_split = t; + } + last_video = c; + } + } + + DCPTime video_end = last_video ? last_video->end() : DCPTime(0); + if (last_split) { + /* Definitely go from the last split to the end of the video content */ + p.push_back (DCPTimePeriod (last_split.get(), video_end)); + } + + if (video_end < len) { + /* And maybe go after that as well if there is any non-video hanging over the end */ + p.push_back (DCPTimePeriod (video_end, len)); + } + break; + } + case REELTYPE_BY_LENGTH: + { + DCPTime current; + /* Integer-divide reel length by the size of one frame to give the number of frames per reel */ + Frame const reel_in_frames = _reel_length / ((j2k_bandwidth() / video_frame_rate()) / 8); + while (current < len) { + DCPTime end = min (len, current + DCPTime::from_frames (reel_in_frames, video_frame_rate ())); + p.push_back (DCPTimePeriod (current, end)); + current = end; + } + break; + } + } + + return p; +}