X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=a50aad81758afc218dab6e38bfed68e431ae909a;hp=f0ddd14a8a941810e06dc8c8905fd39b2e975fb4;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=cf8e0e9e26dbaefab768000ebc1655b34ad11105 diff --git a/src/lib/film.cc b/src/lib/film.cc index f0ddd14a8..a50aad817 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,74 +17,77 @@ */ +/** @file src/film.cc + * @brief A representation of some audio and video content, and details of + * how they should be presented in a DCP. + */ + #include "film.h" #include "job.h" #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 "scaler.h" #include "config.h" -#include "version.h" -#include "ui_signaller.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 - +#include #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; -using dcp::raw_convert; -using dcp::raw_convert; -#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. @@ -113,7 +116,6 @@ Film::Film (boost::filesystem::path dir, bool log) , _dcp_content_type (Config::instance()->default_dcp_content_type ()) , _container (Config::instance()->default_container ()) , _resolution (RESOLUTION_2K) - , _scaler (Scaler::from_id ("bicubic")) , _signed (true) , _encrypted (false) , _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ()) @@ -122,20 +124,20 @@ 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) { set_isdcf_date_today (); - _playlist->Changed.connect (bind (&Film::playlist_changed, this)); - _playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2)); - + _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) { @@ -150,7 +152,7 @@ Film::Film (boost::filesystem::path dir, bool log) } } - set_directory (result); + set_directory (result.make_preferred ()); if (log) { _log.reset (new FileLog (file ("log"))); } else { @@ -160,19 +162,29 @@ Film::Film (boost::filesystem::path dir, bool log) _playlist->set_sequence_video (_sequence_video); } +Film::~Film () +{ + 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 { - assert (container ()); + DCPOMATIC_ASSERT (container ()); SafeStringStream s; s.imbue (std::locale::classic ()); - + s << container()->id() << "_" << resolution_to_string (_resolution) << "_" << _playlist->video_identifier() << "_" << _video_frame_rate - << "_" << scaler()->id() << "_" << j2k_bandwidth(); if (encrypted ()) { @@ -187,133 +199,91 @@ Film::video_identifier () const s << "_S"; } - if (_burn_subtitles) { - s << "_B"; - } - if (_three_d) { s << "_3D"; } return s.str (); } - -/** @return The path to the directory to write video frame info files to */ + +/** @return The file to write video frame info to */ boost::filesystem::path -Film::info_dir () const +Film::info_file () const { boost::filesystem::path p; p /= "info"; p /= video_identifier (); - return dir (p); + return file (p); } 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"; } boost::filesystem::path -Film::video_mxf_filename () const +Film::audio_analysis_path (shared_ptr playlist) const { - return filename_safe_name() + "_video.mxf"; -} + boost::filesystem::path p = dir ("analysis"); -boost::filesystem::path -Film::audio_mxf_filename () const -{ - return filename_safe_name() + "_audio.mxf"; -} - -boost::filesystem::path -Film::subtitle_xml_filename () const -{ - return filename_safe_name() + "_subtitle.xml"; -} + MD5Digester digester; + BOOST_FOREACH (shared_ptr i, playlist->content ()) { + shared_ptr ac = dynamic_pointer_cast (i); + if (!ac) { + continue; + } -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 += "_"; + 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")); } - /* It seems to make sense to auto-save metadata here, since the make DCP may last - a long time, and crashes/power failures are moderately likely. - */ - write_metadata (); - - LOG_GENERAL ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary()); + set_isdcf_date_today (); - { - char buffer[128]; - gethostname (buffer, sizeof (buffer)); - LOG_GENERAL ("Starting to make DCP on %1", buffer); - } + 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()); -#ifdef DCPOMATIC_DEBUG - LOG_GENERAL_NC ("DCP-o-matic built in debug mode."); -#else - LOG_GENERAL_NC ("DCP-o-matic built in optimised mode."); -#endif -#ifdef LIBDCP_DEBUG - LOG_GENERAL_NC ("libdcp built in debug mode."); -#else - LOG_GENERAL_NC ("libdcp built in optimised mode."); -#endif - -#ifdef DCPOMATIC_WINDOWS - OSVERSIONINFO info; - info.dwOSVersionInfoSize = sizeof (info); - GetVersionEx (&info); - LOG_GENERAL ("Windows version %1.%2.%3 SP %4", info.dwMajorVersion, info.dwMinorVersion, info.dwBuildNumber, info.szCSDVersion); -#endif - - LOG_GENERAL ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency ()); - list > const m = mount_info (); - for (list >::const_iterator i = m.begin(); i != m.end(); ++i) { - LOG_GENERAL ("Mount: %1 %2", i->first, i->second); - } - + if (container() == 0) { throw MissingSettingError (_("container")); } @@ -337,29 +307,10 @@ 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); } -/** Count the number of frames that have been encoded for this film. - * @return frame count. - */ -int -Film::encoded_frames () const -{ - if (container() == 0) { - return 0; - } - - int N = 0; - for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (info_dir ()); i != boost::filesystem::directory_iterator(); ++i) { - ++N; - boost::this_thread::interruption_point (); - } - - return N; -} - shared_ptr Film::metadata () const { @@ -379,7 +330,6 @@ Film::metadata () const } root->add_child("Resolution")->add_child_text (resolution_to_string (_resolution)); - root->add_child("Scaler")->add_child_text (_scaler->id ()); root->add_child("J2KBandwidth")->add_child_text (raw_convert (_j2k_bandwidth)); _isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata")); root->add_child("VideoFrameRate")->add_child_text (raw_convert (_video_frame_rate)); @@ -388,10 +338,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; @@ -424,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"); @@ -451,20 +403,30 @@ Film::read_metadata () } _resolution = string_to_resolution (f.string_child ("Resolution")); - _scaler = Scaler::from_id (f.string_child ("Scaler")); _j2k_bandwidth = f.number_child ("J2KBandwidth"); _video_frame_rate = f.number_child ("VideoFrameRate"); _signed = f.optional_bool_child("Signed").get_value_or (true); _encrypted = f.bool_child ("Encrypted"); _audio_channels = f.number_child ("AudioChannels"); + /* We used to allow odd numbers (and zero) channels, but it's just not worth + the pain. + */ + if (_audio_channels == 0) { + _audio_channels = 2; + } else if ((_audio_channels % 2) == 1) { + _audio_channels++; + } _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); @@ -485,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; } @@ -502,7 +464,7 @@ Film::file (boost::filesystem::path f) const p /= f; boost::filesystem::create_directories (p.parent_path ()); - + return p; } @@ -516,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; @@ -534,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. */ @@ -565,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; } @@ -593,7 +555,7 @@ Film::isdcf_name (bool if_created_now) const if (video_frame_rate() != 24) { d << "-" << video_frame_rate(); } - + if (container()) { d << "_" << container()->isdcf_name(); } @@ -602,10 +564,9 @@ Film::isdcf_name (bool if_created_now) const /* 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) { - ContentList cl = content (); 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 ()) { @@ -616,7 +577,7 @@ Film::isdcf_name (bool if_created_now) const break; } } - + if (content_ratio && content_ratio != container()) { d << "-" << content_ratio->isdcf_name(); } @@ -633,36 +594,64 @@ 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; } } - switch (audio_channels ()) { - case 1: - d << "_10"; - break; - case 2: - d << "_20"; - break; - case 3: - d << "_30"; - break; - case 4: - d << "_40"; - break; - case 5: - d << "_50"; - break; - case 6: - d << "_51"; - break; + /* Find all mapped 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)); + } + } + + 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 (non_lfe) { + d << "_" << non_lfe << lfe; } /* XXX: HI/VI */ d << "_" << resolution_to_string (_resolution); - + if (!dm.studio.empty ()) { d << "_" << dm.studio; } @@ -682,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 (); @@ -698,11 +697,26 @@ Film::isdcf_name (bool if_created_now) const string Film::dcp_name (bool if_created_now) const { + string unfiltered; if (use_isdcf_name()) { - return isdcf_name (if_created_now); + unfiltered = isdcf_name (if_created_now); + } else { + unfiltered = name (); } - return name(); + /* Filter out `bad' characters which cause problems with some systems. + There's no apparent list of what really is allowed, so this is a guess. + */ + + string filtered; + string const allowed = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_"; + for (size_t i = 0; i < unfiltered.size(); ++i) { + if (allowed.find (unfiltered[i]) != string::npos) { + filtered += unfiltered[i]; + } + } + + return filtered; } void @@ -747,13 +761,6 @@ Film::set_resolution (Resolution r) signal_changed (RESOLUTION); } -void -Film::set_scaler (Scaler const * s) -{ - _scaler = s; - signal_changed (SCALER); -} - void Film::set_j2k_bandwidth (int b) { @@ -787,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 @@ -797,10 +809,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 @@ -820,9 +833,7 @@ Film::signal_changed (Property p) break; } - if (ui_signaller) { - ui_signaller->emit (boost::bind (boost::ref (Changed), p)); - } + emit (boost::bind (boost::ref (Changed), p)); } void @@ -831,32 +842,6 @@ Film::set_isdcf_date_today () _isdcf_date = boost::gregorian::day_clock::local_day (); } -boost::filesystem::path -Film::info_path (int f, Eyes e) const -{ - boost::filesystem::path p; - p /= info_dir (); - - SafeStringStream s; - s.width (8); - s << setfill('0') << f; - - if (e == EYES_LEFT) { - s << ".L"; - } else if (e == EYES_RIGHT) { - s << ".R"; - } - - s << ".md5"; - - p /= s.str(); - - /* info_dir() will already have added any initial bit of the path, - so don't call file() on this. - */ - return p; -} - boost::filesystem::path Film::j2c_path (int f, Eyes e, bool t) const { @@ -873,7 +858,7 @@ Film::j2c_path (int f, Eyes e, bool t) const } else if (e == EYES_RIGHT) { s << ".R"; } - + s << ".j2c"; if (t) { @@ -889,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 ( @@ -913,14 +898,8 @@ Film::cpls () const } } } - - return out; -} -shared_ptr -Film::make_player () const -{ - return shared_ptr (new Player (shared_from_this (), _playlist)); + return out; } void @@ -937,10 +916,11 @@ Film::set_encrypted (bool e) signal_changed (ENCRYPTED); } -shared_ptr -Film::playlist () const +void +Film::set_key (dcp::Key key) { - return _playlist; + _key = key; + signal_changed (KEY); } ContentList @@ -950,21 +930,25 @@ Film::content () const } void -Film::examine_content (shared_ptr c, bool calculate_digest) +Film::examine_content (shared_ptr c) { - shared_ptr j (new ExamineContentJob (shared_from_this(), c, calculate_digest)); + shared_ptr j (new ExamineContentJob (shared_from_this(), c)); JobManager::instance()->add (j); } void -Film::examine_and_add_content (shared_ptr c, bool calculate_digest) +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, calculate_digest)); - j->Finished.connect (bind (&Film::maybe_add_content, this, boost::weak_ptr (j), boost::weak_ptr (c))); + + shared_ptr j (new ExamineContentJob (shared_from_this(), c)); + + _job_connections.push_back ( + j->Finished.connect (bind (&Film::maybe_add_content, this, weak_ptr (j), weak_ptr (c))) + ); + JobManager::instance()->add (j); } @@ -975,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); } } @@ -1011,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 { @@ -1030,27 +1026,36 @@ Film::active_frame_rate_change (DCPTime t) const } void -Film::playlist_content_changed (boost::weak_ptr c, int p) +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 ()); - } - - if (ui_signaller) { - ui_signaller->emit (boost::bind (boost::ref (ContentChanged), c, p)); + } else if (p == AudioContentProperty::AUDIO_STREAMS) { + signal_changed (NAME); } + + emit (boost::bind (boost::ref (ContentChanged), c, p, frequent)); } void 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; } @@ -1073,7 +1078,7 @@ Film::full_frame () const return dcp::Size (4096, 2160); } - assert (false); + DCPOMATIC_ASSERT (false); return dcp::Size (); } @@ -1081,7 +1086,7 @@ Film::full_frame () const dcp::Size Film::frame_size () const { - return fit_ratio_within (container()->ratio(), full_frame (), 1); + return fit_ratio_within (container()->ratio(), full_frame ()); } dcp::EncryptedKDM @@ -1094,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, @@ -1113,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))); } } @@ -1141,10 +1146,122 @@ Film::required_disk_space () const * Note: the decision made by this method isn't, of course, 100% reliable. */ bool -Film::should_be_enough_disk_space (double& required, double& available) const -{ - boost::filesystem::space_info s = boost::filesystem::space (internal_video_mxf_dir ()); +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_asset_dir() / "test"; + boost::filesystem::path test2 = internal_video_asset_dir() / "test2"; + can_hard_link = true; + FILE* f = fopen_boost (test, "w"); + if (f) { + fclose (f); + boost::system::error_code ec; + boost::filesystem::create_hard_link (test, test2, ec); + if (ec) { + can_hard_link = false; + } + boost::filesystem::remove (test); + boost::filesystem::remove (test2); + } + + 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; + } available = double (s.available) / 1073741824.0f; return (available - required) > 1; } + +string +Film::subtitle_language () const +{ + set languages; + + ContentList cl = content (); + BOOST_FOREACH (shared_ptr& c, cl) { + shared_ptr sc = dynamic_pointer_cast (c); + if (sc) { + languages.insert (sc->subtitle_language ()); + } + } + + string all; + BOOST_FOREACH (string s, languages) { + if (!all.empty ()) { + all += "/" + s; + } else { + all += s; + } + } + + 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); +} + +void +Film::audio_analysis_finished () +{ + /* XXX */ +}