X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=548c51796f4c10352a8a17aed9c4fa5da8b5206b;hb=0242efb9802d7bcbde0701a7267972d4dbe5abb8;hp=edcb124e57e8edaedb91bb956a9dc8a0e15fcbe0;hpb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index edcb124e5..548c51796 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -27,7 +27,7 @@ #include "util.h" #include "job_manager.h" #include "transcode_job.h" -#include "scp_dcp_job.h" +#include "upload_job.h" #include "log.h" #include "exceptions.h" #include "examine_content_job.h" @@ -41,9 +41,11 @@ #include "safe_stringstream.h" #include "environment_info.h" #include "raw_convert.h" +#include "audio_processor.h" +#include "md5_digester.h" #include #include -#include +#include #include #include #include @@ -70,6 +72,7 @@ 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; @@ -84,7 +87,7 @@ using boost::starts_with; using boost::optional; using boost::is_any_of; using dcp::Size; -using dcp::Signer; +using dcp::CertificateChain; #define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); #define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, Log::TYPE_GENERAL); @@ -125,19 +128,19 @@ Film::Film (boost::filesystem::path dir, bool log) , _three_d (false) , _sequence_video (true) , _interop (false) - , _burn_subtitles (false) + , _audio_processor (0) , _state_version (current_state_version) , _dirty (false) { set_isdcf_date_today (); _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)); - + _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) { @@ -167,7 +170,7 @@ Film::~Film () for (list::const_iterator i = _job_connections.begin(); i != _job_connections.end(); ++i) { i->disconnect (); } -} +} string Film::video_identifier () const @@ -176,7 +179,7 @@ Film::video_identifier () const SafeStringStream s; s.imbue (std::locale::classic ()); - + s << container()->id() << "_" << resolution_to_string (_resolution) << "_" << _playlist->video_identifier() @@ -195,17 +198,13 @@ 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 @@ -217,59 +216,69 @@ Film::info_file () const } boost::filesystem::path -Film::internal_video_mxf_dir () const +Film::internal_video_asset_dir () const { return dir ("video"); } boost::filesystem::path -Film::internal_video_mxf_filename () const +Film::internal_video_asset_filename () const { return video_identifier() + ".mxf"; } -string -Film::filename_safe_name () const +boost::filesystem::path +Film::audio_analysis_path (shared_ptr playlist) 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 += "_"; + boost::filesystem::path p = dir ("analysis"); + + MD5Digester digester; + 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 ()); + 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 ()); } } - return o; -} + if (audio_processor ()) { + digester.add (audio_processor()->id ()); + } -boost::filesystem::path -Film::audio_analysis_dir () const -{ - return dir ("analysis"); + p /= digester.get (); + return p; } /** Add suitable Jobs to the JobManager to create a DCP for this Film */ 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()); LOG_GENERAL ("J2K bandwidth %1", j2k_bandwidth()); - + if (container() == 0) { throw MissingSettingError (_("container")); } @@ -293,7 +302,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); } @@ -324,10 +333,12 @@ 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 ()); + if (_audio_processor) { + root->add_child("AudioProcessor")->add_child_text (_audio_processor->id ()); + } _playlist->as_xml (root->add_child ("Playlist")); return doc; @@ -360,7 +371,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"); @@ -403,11 +414,14 @@ 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")) { + _audio_processor = AudioProcessor::from_id (f.string_child ("AudioProcessor")); + } else { + _audio_processor = 0; + } + 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); @@ -428,9 +442,9 @@ Film::dir (boost::filesystem::path d) const boost::filesystem::path p; p /= _directory; p /= d; - + boost::filesystem::create_directories (p); - + return p; } @@ -445,7 +459,7 @@ Film::file (boost::filesystem::path f) const p /= f; boost::filesystem::create_directories (p.parent_path ()); - + return p; } @@ -462,7 +476,7 @@ Film::isdcf_name (bool if_created_now) const 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; @@ -477,7 +491,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. */ @@ -508,15 +522,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; } @@ -536,13 +550,13 @@ 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 */ @@ -560,7 +574,7 @@ Film::isdcf_name (bool if_created_now) const break; } } - + if (content_ratio && content_ratio != container()) { d << "-" << content_ratio->isdcf_name(); } @@ -577,39 +591,53 @@ 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; } } /* Find all mapped channels */ - list mapped; - for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) { - shared_ptr ac = dynamic_pointer_cast (*i); - if (ac) { - list c = ac->audio_mapping().mapped_dcp_channels (); - copy (c.begin(), c.end(), back_inserter (mapped)); - } - } - - mapped.sort (); - mapped.unique (); - - /* Count them */ - int non_lfe = 0; int lfe = 0; - for (list::const_iterator i = mapped.begin(); i != mapped.end(); ++i) { - if (static_cast (*i) >= audio_channels()) { - /* This channel is mapped but is not included in the DCP */ - continue; - } - - if ((*i) == dcp::LFE) { + + 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 { - ++non_lfe; + } + } else { + list mapped; + for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) { + 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 { + ++non_lfe; + } } } @@ -620,7 +648,7 @@ Film::isdcf_name (bool if_created_now) const /* XXX: HI/VI */ d << "_" << resolution_to_string (_resolution); - + if (!dm.studio.empty ()) { d << "_" << dm.studio; } @@ -640,7 +668,7 @@ Film::isdcf_name (bool if_created_now) const } else { d << "_SMPTE"; } - + if (three_d ()) { d << "-3D"; } @@ -674,7 +702,7 @@ Film::dcp_name (bool if_created_now) const filtered += unfiltered[i]; } } - + return filtered; } @@ -763,10 +791,11 @@ Film::set_interop (bool i) } void -Film::set_burn_subtitles (bool b) +Film::set_audio_processor (AudioProcessor const * processor) { - _burn_subtitles = b; - signal_changed (BURN_SUBTITLES); + _audio_processor = processor; + signal_changed (AUDIO_PROCESSOR); + signal_changed (AUDIO_CHANNELS); } void @@ -811,7 +840,7 @@ Film::j2c_path (int f, Eyes e, bool t) const } else if (e == EYES_RIGHT) { s << ".R"; } - + s << ".j2c"; if (t) { @@ -827,7 +856,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 ( @@ -851,14 +880,8 @@ Film::cpls () const } } } - - return out; -} -shared_ptr -Film::make_player () const -{ - return shared_ptr (new Player (shared_from_this (), _playlist)); + return out; } void @@ -882,12 +905,6 @@ Film::set_key (dcp::Key key) signal_changed (KEY); } -shared_ptr -Film::playlist () const -{ - return _playlist; -} - ContentList Film::content () const { @@ -907,13 +924,13 @@ Film::examine_and_add_content (shared_ptr c) if (dynamic_pointer_cast (c)) { 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))) ); - + JobManager::instance()->add (j); } @@ -924,7 +941,7 @@ 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); @@ -979,15 +996,17 @@ Film::active_frame_rate_change (DCPTime t) const } void -Film::playlist_content_changed (boost::weak_ptr c, int p) +Film::playlist_content_changed (boost::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) { signal_changed (NAME); } - emit (boost::bind (boost::ref (ContentChanged), c, p)); + emit (boost::bind (boost::ref (ContentChanged), c, p, frequent)); } void @@ -995,7 +1014,7 @@ Film::playlist_changed () { signal_changed (CONTENT); signal_changed (NAME); -} +} int Film::audio_frame_rate () const @@ -1044,11 +1063,11 @@ Film::make_kdm ( ) const { shared_ptr cpl (new dcp::CPL (cpl_file)); - shared_ptr signer = Config::instance()->signer(); + shared_ptr signer = Config::instance()->signer(); 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); @@ -1094,8 +1113,8 @@ bool Film::should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const { /* Create a test file and see if we can hard-link it */ - boost::filesystem::path test = internal_video_mxf_dir() / "test"; - boost::filesystem::path test2 = internal_video_mxf_dir() / "test2"; + boost::filesystem::path test = internal_video_asset_dir() / "test"; + boost::filesystem::path test2 = internal_video_asset_dir() / "test2"; can_hard_link = true; FILE* f = fopen_boost (test, "w"); if (f) { @@ -1109,7 +1128,7 @@ Film::should_be_enough_disk_space (double& required, double& available, bool& ca boost::filesystem::remove (test2); } - boost::filesystem::space_info s = boost::filesystem::space (internal_video_mxf_dir ()); + boost::filesystem::space_info s = boost::filesystem::space (internal_video_asset_dir ()); required = double (required_disk_space ()) / 1073741824.0f; if (!can_hard_link) { required *= 2; @@ -1122,7 +1141,7 @@ string Film::subtitle_language () const { set languages; - + ContentList cl = content (); BOOST_FOREACH (shared_ptr& c, cl) { shared_ptr sc = dynamic_pointer_cast (c); @@ -1142,3 +1161,65 @@ Film::subtitle_language () const return all; } + +/** Change the gains of the supplied AudioMapping to make it a default + * for this film. The defaults are guessed based on what processor (if any) + * is in use and the number of input channels. + */ +void +Film::make_audio_mapping_default (AudioMapping& mapping) const +{ + if (audio_processor ()) { + audio_processor()->make_audio_mapping_default (mapping); + } else { + mapping.make_zero (); + if (mapping.input_channels() == 1) { + /* Mono -> Centre */ + mapping.set (0, static_cast (dcp::CENTRE), 1); + } else { + /* 1:1 mapping */ + for (int i = 0; i < min (mapping.input_channels(), mapping.output_channels()); ++i) { + mapping.set (i, i, 1); + } + } + } +} + +/** @return The names of the channels that audio contents' outputs are passed into; + * this is either the DCP or a AudioProcessor. + */ +vector +Film::audio_output_names () const +{ + if (audio_processor ()) { + return audio_processor()->input_names (); + } + + vector n; + n.push_back (_("L")); + n.push_back (_("R")); + n.push_back (_("C")); + n.push_back (_("Lfe")); + n.push_back (_("Ls")); + n.push_back (_("Rs")); + n.push_back (_("HI")); + n.push_back (_("VI")); + n.push_back (_("Lc")); + n.push_back (_("Rc")); + n.push_back (_("BsL")); + n.push_back (_("BsR")); + + return vector (n.begin(), n.begin() + audio_channels ()); +} + +void +Film::repeat_content (ContentList c, int n) +{ + _playlist->repeat (c, n); +} + +void +Film::remove_content (ContentList c) +{ + _playlist->remove (c); +}