X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=f41371892963b1d22df478be6d2a1f15786d2d99;hb=b16fa5f0de631821a7acc994645a291bc7aa90c9;hp=e5c5d931265a41bf293d2eef940251d7c85811eb;hpb=b4696a8776f69d6ed7bea01653d1cb6e62b6a8e9;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index e5c5d9312..f41371892 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -41,6 +41,8 @@ #include "safe_stringstream.h" #include "environment_info.h" #include "raw_convert.h" +#include "audio_processor.h" +#include "md5_digester.h" #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; @@ -126,13 +129,14 @@ Film::Film (boost::filesystem::path dir, bool log) , _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) @@ -217,13 +221,13 @@ 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"; } @@ -245,9 +249,28 @@ Film::filename_safe_name () const } boost::filesystem::path -Film::audio_analysis_dir () const +Film::audio_analysis_path () const { - return dir ("analysis"); + boost::filesystem::path p = dir ("analysis"); + + MD5Digester digester; + BOOST_FOREACH (shared_ptr i, 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 (audio_processor ()) { + digester.add (audio_processor()->id ()); + } + + p /= digester.get (); + return p; } /** Add suitable Jobs to the JobManager to create a DCP for this Film */ @@ -328,6 +351,9 @@ Film::metadata () const 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; @@ -408,6 +434,12 @@ Film::read_metadata () } _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); @@ -584,11 +616,11 @@ Film::isdcf_name (bool if_created_now) const /* Find all mapped channels */ - list mapped; + 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 (); + list c = ac->audio_mapping().mapped_output_channels (); copy (c.begin(), c.end(), back_inserter (mapped)); } } @@ -600,13 +632,13 @@ Film::isdcf_name (bool if_created_now) const int non_lfe = 0; int lfe = 0; - for (list::const_iterator i = mapped.begin(); i != mapped.end(); ++i) { - if (static_cast (*i) >= audio_channels()) { + 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 ((*i) == dcp::LFE) { + if (static_cast (*i) == dcp::LFE) { ++lfe; } else { ++non_lfe; @@ -769,6 +801,14 @@ Film::set_burn_subtitles (bool b) signal_changed (BURN_SUBTITLES); } +void +Film::set_audio_processor (AudioProcessor const * processor) +{ + _audio_processor = processor; + signal_changed (AUDIO_PROCESSOR); + signal_changed (AUDIO_CHANNELS); +} + void Film::signal_changed (Property p) { @@ -855,12 +895,6 @@ Film::cpls () const return out; } -shared_ptr -Film::make_player () const -{ - return shared_ptr (new Player (shared_from_this (), _playlist)); -} - void Film::set_signed (bool s) { @@ -882,12 +916,6 @@ Film::set_key (dcp::Key key) signal_changed (KEY); } -shared_ptr -Film::playlist () const -{ - return _playlist; -} - ContentList Film::content () const { @@ -979,17 +1007,15 @@ 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) { if (p == VideoContentProperty::VIDEO_FRAME_RATE) { set_video_frame_rate (_playlist->best_dcp_frame_rate ()); - } else if ( - p == AudioContentProperty::AUDIO_MAPPING || - p == AudioContentProperty::AUDIO_CHANNELS) { + } 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 @@ -1096,8 +1122,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) { @@ -1111,7 +1137,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; @@ -1144,3 +1170,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); +}