X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=77e1be872b3b981b3391665d224454e1f9226efe;hb=dbfbdcba0f5f08a932ba199039f2ca1530e482ac;hp=5ec5fbc2f280a1b8e17d9e952b7c82bd33c54318;hpb=4675119254338408f50685c8eb9317efd74e538b;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index 5ec5fbc2f..77e1be872 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -27,38 +27,43 @@ #include "util.h" #include "job_manager.h" #include "transcode_job.h" -#include "scp_dcp_job.h" -#include "log.h" +#include "upload_job.h" +#include "null_log.h" +#include "file_log.h" #include "exceptions.h" #include "examine_content_job.h" #include "config.h" #include "playlist.h" -#include "player.h" #include "dcp_content_type.h" #include "ratio.h" #include "cross.h" -#include "cinema.h" #include "safe_stringstream.h" #include "environment_info.h" #include "raw_convert.h" #include "audio_processor.h" #include "md5_digester.h" +#include "compose.hpp" +#include "screen.h" +#include "audio_content.h" +#include "video_content.h" +#include "subtitle_content.h" +#include "ffmpeg_content.h" +#include "dcp_content.h" +#include "screen_kdm.h" #include #include -#include +#include #include #include #include #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -66,31 +71,23 @@ #include "i18n.h" using std::string; -using std::multimap; using std::pair; -using std::map; using std::vector; using std::setfill; using std::min; using std::max; using std::make_pair; -using std::endl; using std::cout; using std::list; using std::set; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; -using boost::to_upper_copy; -using boost::ends_with; -using boost::starts_with; using boost::optional; using boost::is_any_of; -using dcp::Size; -using dcp::Signer; -#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. @@ -127,8 +124,7 @@ Film::Film (boost::filesystem::path dir, bool log) , _audio_channels (6) , _three_d (false) , _sequence_video (true) - , _interop (false) - , _burn_subtitles (false) + , _interop (Config::instance()->default_interop ()) , _audio_processor (0) , _state_version (current_state_version) , _dirty (false) @@ -137,11 +133,11 @@ Film::Film (boost::filesystem::path dir, bool log) _playlist_changed_connection = _playlist->Changed.connect (bind (&Film::playlist_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) */ - + boost::filesystem::path p (boost::filesystem::system_complete (dir)); boost::filesystem::path result; for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) { @@ -168,10 +164,14 @@ Film::Film (boost::filesystem::path dir, bool log) Film::~Film () { - for (list::const_iterator i = _job_connections.begin(); i != _job_connections.end(); ++i) { - i->disconnect (); + BOOST_FOREACH (boost::signals2::connection& i, _job_connections) { + i.disconnect (); + } + + BOOST_FOREACH (boost::signals2::connection& i, _audio_analysis_connections) { + i.disconnect (); } -} +} string Film::video_identifier () const @@ -180,7 +180,7 @@ Film::video_identifier () const SafeStringStream s; s.imbue (std::locale::classic ()); - + s << container()->id() << "_" << resolution_to_string (_resolution) << "_" << _playlist->video_identifier() @@ -199,24 +199,20 @@ Film::video_identifier () const s << "_S"; } - if (_burn_subtitles) { - s << "_B"; - } - if (_three_d) { s << "_3D"; } return s.str (); } - + /** @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); } @@ -227,42 +223,34 @@ 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"; -} - -string -Film::filename_safe_name () const -{ - string const n = name (); - string o; - for (size_t i = 0; i < n.length(); ++i) { - if (isalnum (n[i])) { - o += n[i]; - } else { - o += "_"; - } - } - - return o; + return video_identifier() + "_" + raw_convert (p.from.get()) + "_" + raw_convert (p.to.get()) + ".mxf"; } boost::filesystem::path -Film::audio_analysis_path () const +Film::audio_analysis_path (shared_ptr playlist) const { boost::filesystem::path p = dir ("analysis"); MD5Digester digester; - BOOST_FOREACH (shared_ptr i, content ()) { + BOOST_FOREACH (shared_ptr i, playlist->content ()) { shared_ptr ac = dynamic_pointer_cast (i); if (!ac) { continue; } - + digester.add (ac->digest ()); digester.add (ac->audio_mapping().digest ()); - digester.add (ac->audio_gain ()); + if (playlist->content().size() != 1) { + /* Analyses should be considered equal regardless of gain + if they were made from just one piece of content. This + is because we can fake any gain change in a single-content + analysis at the plotting stage rather than having to + recompute it. + */ + digester.add (ac->audio_gain ()); + } } if (audio_processor ()) { @@ -277,22 +265,25 @@ Film::audio_analysis_path () const void Film::make_dcp () { - set_isdcf_date_today (); - if (dcp_name().find ("/") != string::npos) { throw BadSettingError (_("name"), _("cannot contain slashes")); } + set_isdcf_date_today (); + environment_info (log ()); - ContentList cl = content (); - for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) { - LOG_GENERAL ("Content: %1", (*i)->technical_summary()); + BOOST_FOREACH (shared_ptr i, content ()) { + LOG_GENERAL ("Content: %1", i->technical_summary()); } LOG_GENERAL ("DCP video rate %1 fps", video_frame_rate()); - LOG_GENERAL ("%1 threads", Config::instance()->num_local_encoding_threads()); + if (Config::instance()->only_servers_encode ()) { + LOG_GENERAL_NC ("0 threads: ONLY SERVERS SET TO ENCODE"); + } else { + LOG_GENERAL ("%1 threads", Config::instance()->num_local_encoding_threads()); + } LOG_GENERAL ("J2K bandwidth %1", j2k_bandwidth()); - + if (container() == 0) { throw MissingSettingError (_("container")); } @@ -316,7 +307,7 @@ Film::make_dcp () void Film::send_dcp_to_tms () { - shared_ptr j (new SCPDCPJob (shared_from_this())); + shared_ptr j (new UploadJob (shared_from_this())); JobManager::instance()->add (j); } @@ -347,7 +338,6 @@ Film::metadata () const 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("Interop")->add_child_text (_interop ? "1" : "0"); - root->add_child("BurnSubtitles")->add_child_text (_burn_subtitles ? "1" : "0"); root->add_child("Signed")->add_child_text (_signed ? "1" : "0"); root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0"); root->add_child("Key")->add_child_text (_key.hex ()); @@ -386,7 +376,7 @@ Film::read_metadata () 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!")); } - + _name = f.string_child ("Name"); if (_state_version >= 9) { _use_isdcf_name = f.bool_child ("UseISDCFName"); @@ -429,9 +419,6 @@ Film::read_metadata () _sequence_video = f.bool_child ("SequenceVideo"); _three_d = f.bool_child ("ThreeD"); _interop = f.bool_child ("Interop"); - if (_state_version >= 32) { - _burn_subtitles = f.bool_child ("BurnSubtitles"); - } _key = dcp::Key (f.string_child ("Key")); if (f.optional_string_child ("AudioProcessor")) { @@ -460,9 +447,9 @@ Film::dir (boost::filesystem::path d) const boost::filesystem::path p; p /= _directory; p /= d; - + boost::filesystem::create_directories (p); - + return p; } @@ -477,7 +464,7 @@ Film::file (boost::filesystem::path f) const p /= f; boost::filesystem::create_directories (p.parent_path ()); - + return p; } @@ -491,10 +478,10 @@ Film::isdcf_name (bool if_created_now) const /* Split the raw name up into words */ vector words; - split (words, raw_name, is_any_of (" ")); + split (words, raw_name, is_any_of (" _-")); string fixed_name; - + /* Add each word to fixed_name */ for (vector::const_iterator i = words.begin(); i != words.end(); ++i) { string w = *i; @@ -509,7 +496,7 @@ Film::isdcf_name (bool if_created_now) const ++caps; } } - + /* If w is all caps make the rest of it lower case, otherwise leave it alone. */ @@ -540,15 +527,15 @@ Film::isdcf_name (bool if_created_now) const if (dm.temp_version) { d << "-Temp"; } - + if (dm.pre_release) { d << "-Pre"; } - + if (dm.red_band) { d << "-RedBand"; } - + if (!dm.chain.empty ()) { d << "-" << dm.chain; } @@ -568,20 +555,18 @@ Film::isdcf_name (bool if_created_now) const if (video_frame_rate() != 24) { d << "-" << video_frame_rate(); } - + if (container()) { d << "_" << container()->isdcf_name(); } - ContentList cl = content (); - /* XXX: this uses the first bit of content only */ /* The standard says we don't do this for trailers, for some strange reason */ if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::TRAILER) { Ratio const * content_ratio = 0; - for (ContentList::iterator i = cl.begin(); i != cl.end(); ++i) { - shared_ptr vc = dynamic_pointer_cast (*i); + BOOST_FOREACH (shared_ptr i, content ()) { + shared_ptr vc = dynamic_pointer_cast (i); if (vc) { /* Here's the first piece of video content */ if (vc->scale().ratio ()) { @@ -592,7 +577,7 @@ Film::isdcf_name (bool if_created_now) const break; } } - + if (content_ratio && content_ratio != container()) { d << "-" << content_ratio->isdcf_name(); } @@ -609,7 +594,9 @@ Film::isdcf_name (bool if_created_now) const if (!dm.territory.empty ()) { d << "_" << dm.territory; - if (!dm.rating.empty ()) { + if (dm.rating.empty ()) { + d << "-NR"; + } else { d << "-" << dm.rating; } } @@ -630,25 +617,25 @@ Film::isdcf_name (bool if_created_now) const } } else { list mapped; - for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) { - shared_ptr ac = dynamic_pointer_cast (*i); + 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)); } } - + 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 { @@ -656,7 +643,7 @@ Film::isdcf_name (bool if_created_now) const } } } - + if (non_lfe) { d << "_" << non_lfe << lfe; } @@ -664,7 +651,7 @@ Film::isdcf_name (bool if_created_now) const /* XXX: HI/VI */ d << "_" << resolution_to_string (_resolution); - + if (!dm.studio.empty ()) { d << "_" << dm.studio; } @@ -684,13 +671,23 @@ Film::isdcf_name (bool if_created_now) const } else { d << "_SMPTE"; } - + if (three_d ()) { 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 (); @@ -718,7 +715,7 @@ Film::dcp_name (bool if_created_now) const filtered += unfiltered[i]; } } - + return filtered; } @@ -797,6 +794,11 @@ Film::set_three_d (bool t) { _three_d = t; signal_changed (THREE_D); + + if (_three_d && _isdcf_metadata.two_d_version_of_three_d) { + _isdcf_metadata.two_d_version_of_three_d = false; + signal_changed (ISDCF_METADATA); + } } void @@ -806,13 +808,6 @@ Film::set_interop (bool i) signal_changed (INTEROP); } -void -Film::set_burn_subtitles (bool b) -{ - _burn_subtitles = b; - signal_changed (BURN_SUBTITLES); -} - void Film::set_audio_processor (AudioProcessor const * processor) { @@ -863,7 +858,7 @@ Film::j2c_path (int f, Eyes e, bool t) const } else if (e == EYES_RIGHT) { s << ".R"; } - + s << ".j2c"; if (t) { @@ -879,7 +874,7 @@ vector Film::cpls () const { vector out; - + boost::filesystem::path const dir = directory (); for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) { if ( @@ -903,7 +898,7 @@ Film::cpls () const } } } - + return out; } @@ -944,16 +939,16 @@ Film::examine_content (shared_ptr c) void Film::examine_and_add_content (shared_ptr c) { - if (dynamic_pointer_cast (c)) { + if (dynamic_pointer_cast (c) && !_directory.empty ()) { run_ffprobe (c->path(0), file ("ffprobe.log"), _log); } - + shared_ptr j (new ExamineContentJob (shared_from_this(), c)); _job_connections.push_back ( - j->Finished.connect (bind (&Film::maybe_add_content, this, boost::weak_ptr (j), boost::weak_ptr (c))) + j->Finished.connect (bind (&Film::maybe_add_content, this, weak_ptr (j), weak_ptr (c))) ); - + JobManager::instance()->add (j); } @@ -964,10 +959,21 @@ Film::maybe_add_content (weak_ptr j, weak_ptr c) if (!job || !job->finished_ok ()) { return; } - + shared_ptr content = c.lock (); - if (content) { - add_content (content); + if (!content) { + return; + } + + add_content (content); + if (Config::instance()->automatic_audio_analysis ()) { + shared_ptr playlist (new Playlist); + playlist->add (content); + boost::signals2::connection c; + JobManager::instance()->analyse_audio ( + shared_from_this (), playlist, c, bind (&Film::audio_analysis_finished, this) + ); + _audio_analysis_connections.push_back (c); } } @@ -1000,6 +1006,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 { @@ -1019,8 +1026,10 @@ Film::active_frame_rate_change (DCPTime t) const } void -Film::playlist_content_changed (boost::weak_ptr c, int p, bool frequent) +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) { @@ -1035,12 +1044,18 @@ Film::playlist_changed () { signal_changed (CONTENT); signal_changed (NAME); -} +} int Film::audio_frame_rate () const { - /* XXX */ + BOOST_FOREACH (shared_ptr i, content ()) { + shared_ptr a = dynamic_pointer_cast (i); + if (a && a->has_rate_above_48k ()) { + return 96000; + } + } + return 48000; } @@ -1084,17 +1099,17 @@ Film::make_kdm ( ) const { shared_ptr cpl (new dcp::CPL (cpl_file)); - shared_ptr signer = Config::instance()->signer(); + shared_ptr signer = Config::instance()->signer_chain (); if (!signer->valid ()) { throw InvalidSignerError (); } - + return dcp::DecryptedKDM ( cpl, key(), from, until, "DCP-o-matic", cpl->content_title_text(), dcp::LocalTime().as_string() ).encrypt (signer, target, formulation); } -list +list Film::make_kdms ( list > screens, boost::filesystem::path dcp, @@ -1103,11 +1118,11 @@ Film::make_kdms ( dcp::Formulation formulation ) const { - list kdms; + 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)); + BOOST_FOREACH (shared_ptr i, screens) { + if (i->certificate) { + kdms.push_back (ScreenKDM (i, make_kdm (i->certificate.get(), dcp, from, until, formulation))); } } @@ -1162,7 +1177,7 @@ string Film::subtitle_language () const { set languages; - + ContentList cl = content (); BOOST_FOREACH (shared_ptr& c, cl) { shared_ptr sc = dynamic_pointer_cast (c); @@ -1215,7 +1230,7 @@ Film::audio_output_names () const if (audio_processor ()) { return audio_processor()->input_names (); } - + vector n; n.push_back (_("L")); n.push_back (_("R")); @@ -1244,3 +1259,18 @@ Film::remove_content (ContentList c) { _playlist->remove (c); } + +void +Film::audio_analysis_finished () +{ + /* XXX */ +} + +list +Film::reels () const +{ + list p; + p.push_back (DCPTimePeriod (DCPTime (), length ())); + return p; +} +