X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=70142dcf38f1ac36dcdcbea4317cb84e65b08025;hp=e0aa08a77c141034aae6cf24b9639e4f278c37a6;hb=HEAD;hpb=7c0e02d933c243f0559631402e02fb598caf4647 diff --git a/src/lib/film.cc b/src/lib/film.cc index e0aa08a77..d9ab6e2a3 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -166,6 +167,7 @@ Film::Film (optional dir) , _three_d (false) , _sequence (true) , _interop (Config::instance()->default_interop ()) + , _limit_to_smpte_bv20(false) , _audio_processor (0) , _reel_type (ReelType::SINGLE) , _reel_length (2000000000) @@ -204,27 +206,7 @@ Film::Film (optional dir) _playlist_length_change_connection = _playlist->LengthChange.connect (bind(&Film::playlist_length_change, this)); if (dir) { - /* 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.get())); - boost::filesystem::path result; - for (auto i: p) { - if (i == "..") { - boost::system::error_code ec; - if (boost::filesystem::is_symlink(result, ec) || result.filename() == "..") { - result /= i; - } else { - result = result.parent_path (); - } - } else if (i != ".") { - result /= i; - } - } - - set_directory (result.make_preferred ()); + set_directory(dcp::filesystem::weakly_canonical(*dir)); } if (_directory) { @@ -269,6 +251,11 @@ Film::video_identifier () const s += "_I"; } else { s += "_S"; + if (_limit_to_smpte_bv20) { + s += "_L20"; + } else { + s += "_L21"; + } } if (_three_d) { @@ -310,13 +297,13 @@ Film::audio_analysis_path (shared_ptr playlist) const auto p = dir ("analysis"); Digester digester; - for (auto i: playlist->content()) { - if (!i->audio) { + for (auto content: playlist->content()) { + if (!content->audio) { continue; } - digester.add (i->digest()); - digester.add (i->audio->mapping().digest()); + digester.add(content->digest()); + digester.add(content->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 @@ -324,14 +311,14 @@ Film::audio_analysis_path (shared_ptr playlist) const analysis at the plotting stage rather than having to recompute it. */ - digester.add (i->audio->gain()); + digester.add(content->audio->gain()); /* Likewise we only care about position if we're looking at a * whole-project view. */ - digester.add (i->position().get()); - digester.add (i->trim_start().get()); - digester.add (i->trim_end().get()); + digester.add(content->position().get()); + digester.add(content->trim_start().get()); + digester.add(content->trim_end().get()); } } @@ -353,6 +340,7 @@ Film::subtitle_analysis_path (shared_ptr content) const Digester digester; digester.add (content->digest()); + digester.add(_interop ? "1" : "0"); if (!content->text.empty()) { auto tc = content->text.front(); @@ -415,6 +403,7 @@ Film::metadata (bool with_content_paths) const root->add_child("ThreeD")->add_child_text (_three_d ? "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("LimitToSMPTEBv20")->add_child_text(_limit_to_smpte_bv20 ? "1" : "0"); root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0"); root->add_child("Key")->add_child_text (_key.hex ()); root->add_child("ContextID")->add_child_text (_context_id); @@ -425,10 +414,10 @@ Film::metadata (bool with_content_paths) const root->add_child("ReelLength")->add_child_text (raw_convert (_reel_length)); root->add_child("ReencodeJ2K")->add_child_text (_reencode_j2k ? "1" : "0"); root->add_child("UserExplicitVideoFrameRate")->add_child_text(_user_explicit_video_frame_rate ? "1" : "0"); - for (map::const_iterator i = _markers.begin(); i != _markers.end(); ++i) { + for (auto const& marker: _markers) { auto m = root->add_child("Marker"); - m->set_attribute("Type", dcp::marker_to_string(i->first)); - m->add_child_text(raw_convert(i->second.get())); + m->set_attribute("Type", dcp::marker_to_string(marker.first)); + m->add_child_text(raw_convert(marker.second.get())); } for (auto i: _ratings) { i.as_xml (root->add_child("Rating")); @@ -437,6 +426,7 @@ Film::metadata (bool with_content_paths) const root->add_child("ContentVersion")->add_child_text(i); } root->add_child("NameLanguage")->add_child_text(_name_language.to_string()); + root->add_child("TerritoryType")->add_child_text(territory_type_to_string(_territory_type)); if (_release_territory) { root->add_child("ReleaseTerritory")->add_child_text(_release_territory->subtag()); } @@ -486,8 +476,13 @@ void Film::write_metadata () { DCPOMATIC_ASSERT (directory()); - boost::filesystem::create_directories (directory().get()); - metadata()->write_to_file_formatted(file(metadata_file).string()); + dcp::filesystem::create_directories(directory().get()); + auto const filename = file(metadata_file); + try { + metadata()->write_to_file_formatted(filename.string()); + } catch (xmlpp::exception& e) { + throw FileError(String::compose("Could not write metadata file (%1)", e.what()), filename); + } set_dirty (false); } @@ -495,7 +490,7 @@ Film::write_metadata () void Film::write_template (boost::filesystem::path path) const { - boost::filesystem::create_directories (path.parent_path()); + dcp::filesystem::create_directories(path.parent_path()); shared_ptr doc = metadata (false); metadata(false)->write_to_file_formatted(path.string()); } @@ -507,19 +502,19 @@ list Film::read_metadata (optional path) { if (!path) { - if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file (metadata_file))) { + if (dcp::filesystem::exists(file("metadata")) && !dcp::filesystem::exists(file(metadata_file))) { 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!")); } path = file (metadata_file); } - if (!boost::filesystem::exists(*path)) { + if (!dcp::filesystem::exists(*path)) { throw FileNotFoundError(*path); } cxml::Document f ("Metadata"); - f.read_file (path.get ()); + f.read_file(dcp::filesystem::fix_long_path(path.get())); _state_version = f.number_child ("Version"); if (_state_version > current_state_version) { @@ -527,9 +522,9 @@ Film::read_metadata (optional path) } else if (_state_version < current_state_version) { /* This is an older version; save a copy (if we haven't already) */ auto const older = path->parent_path() / String::compose("metadata.%1.xml", _state_version); - if (!boost::filesystem::is_regular_file(older)) { + if (!dcp::filesystem::is_regular_file(older)) { try { - boost::filesystem::copy_file(*path, older); + dcp::filesystem::copy_file(*path, older); } catch (...) { /* Never mind; at least we tried */ } @@ -585,6 +580,7 @@ Film::read_metadata (optional path) _three_d = f.bool_child ("ThreeD"); _interop = f.bool_child ("Interop"); + _limit_to_smpte_bv20 = f.optional_bool_child("LimitToSMPTEBv20").get_value_or(false); _key = dcp::Key (f.string_child ("Key")); _context_id = f.optional_string_child("ContextID").get_value_or (dcp::make_uuid ()); @@ -622,6 +618,10 @@ Film::read_metadata (optional path) if (name_language) { _name_language = dcp::LanguageTag (*name_language); } + auto territory_type = f.optional_string_child("TerritoryType"); + if (territory_type) { + _territory_type = string_to_territory_type(*territory_type); + } auto release_territory = f.optional_string_child("ReleaseTerritory"); if (release_territory) { _release_territory = dcp::LanguageTag::RegionSubtag (*release_territory); @@ -693,10 +693,10 @@ Film::read_metadata (optional path) } _studio = isdcf->optional_string_child("Studio"); _facility = isdcf->optional_string_child("Facility"); - _temp_version = isdcf->optional_bool_child("TempVersion").get_value_or("false"); - _pre_release = isdcf->optional_bool_child("PreRelease").get_value_or("false"); - _red_band = isdcf->optional_bool_child("RedBand").get_value_or("false"); - _two_d_version_of_three_d = isdcf->optional_bool_child("TwoDVersionOfThreeD").get_value_or("false"); + _temp_version = isdcf->optional_bool_child("TempVersion").get_value_or(false); + _pre_release = isdcf->optional_bool_child("PreRelease").get_value_or(false); + _red_band = isdcf->optional_bool_child("RedBand").get_value_or(false); + _two_d_version_of_three_d = isdcf->optional_bool_child("TwoDVersionOfThreeD").get_value_or(false); _chain = isdcf->optional_string_child("Chain"); } @@ -726,7 +726,7 @@ Film::dir (boost::filesystem::path d, bool create) const p /= d; if (create) { - boost::filesystem::create_directories (p); + dcp::filesystem::create_directories(p); } return p; @@ -744,7 +744,7 @@ Film::file (boost::filesystem::path f) const p /= _directory.get(); p /= f; - boost::filesystem::create_directories (p.parent_path ()); + dcp::filesystem::create_directories(p.parent_path()); return p; } @@ -776,16 +776,27 @@ Film::mapped_audio_channels () const pair, vector> -Film::subtitle_languages () const +Film::subtitle_languages(bool* burnt_in) const { + if (burnt_in) { + *burnt_in = true; + } + pair, vector> result; for (auto i: content()) { - for (auto j: i->text) { - if (j->use() && j->type() == TextType::OPEN_SUBTITLE && j->language()) { - if (j->language_is_additional()) { - result.second.push_back (j->language().get()); - } else { - result.first = j->language().get(); + auto dcp = dynamic_pointer_cast(i); + for (auto const& text: i->text) { + auto const use = text->use() || (dcp && dcp->reference_text(TextType::OPEN_SUBTITLE)); + if (use && text->type() == TextType::OPEN_SUBTITLE) { + if (!text->burn() && burnt_in) { + *burnt_in = false; + } + if (text->language()) { + if (text->language_is_additional()) { + result.second.push_back(text->language().get()); + } else { + result.first = text->language().get(); + } } } } @@ -801,6 +812,22 @@ Film::subtitle_languages () const } +vector +Film::closed_caption_languages() const +{ + vector result; + for (auto i: content()) { + for (auto text: i->text) { + if (text->use() && text->type() == TextType::CLOSED_CAPTION && text->dcp_track() && text->dcp_track()->language) { + result.push_back(*text->dcp_track()->language); + } + } + } + + return result; +} + + /** @return a ISDCF-compliant name for a DCP of this film */ string Film::isdcf_name (bool if_created_now) const @@ -849,7 +876,7 @@ Film::isdcf_name (bool if_created_now) const } } - fixed_name = fixed_name.substr(0, 14); + fixed_name = fixed_name.substr(0, Config::instance()->isdcf_name_part_length()); isdcf_name += fixed_name; @@ -916,10 +943,12 @@ Film::isdcf_name (bool if_created_now) const if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::ContentKind::TRAILER) { auto first_video = std::find_if(content_list.begin(), content_list.end(), [](shared_ptr c) { return static_cast(c->video); }); if (first_video != content_list.end()) { - auto first_ratio = lrintf((*first_video)->video->scaled_size(frame_size()).ratio() * 100); - auto container_ratio = lrintf(container()->ratio() * 100); - if (first_ratio != container_ratio) { - isdcf_name += "-" + dcp::raw_convert(first_ratio); + if (auto scaled_size = (*first_video)->video->scaled_size(frame_size())) { + auto first_ratio = lrintf(scaled_size->ratio() * 100); + auto container_ratio = lrintf(container()->ratio() * 100); + if (first_ratio != container_ratio) { + isdcf_name += "-" + dcp::raw_convert(first_ratio); + } } } } @@ -939,23 +968,9 @@ Film::isdcf_name (bool if_created_now) const isdcf_name += "_" + to_upper (audio_language); - /* I'm not clear on the precise details of the convention for CCAP labelling; - for now I'm just appending -CCAP if we have any closed captions. - */ - - auto burnt_in = true; - auto ccap = false; - for (auto i: content_list) { - for (auto j: i->text) { - if (j->type() == TextType::OPEN_SUBTITLE && j->use() && !j->burn()) { - burnt_in = false; - } else if (j->type() == TextType::CLOSED_CAPTION && j->use()) { - ccap = true; - } - } - } - - auto sub_langs = subtitle_languages(); + bool burnt_in; + auto sub_langs = subtitle_languages(&burnt_in); + auto ccap_langs = closed_caption_languages(); if (sub_langs.first && sub_langs.first->language()) { auto lang = entry_for_language(*sub_langs.first); if (burnt_in) { @@ -965,15 +980,18 @@ Film::isdcf_name (bool if_created_now) const } isdcf_name += "-" + lang; - if (ccap) { - isdcf_name += "-CCAP"; - } + } else if (!ccap_langs.empty()) { + isdcf_name += "-" + to_upper(entry_for_language(ccap_langs[0])) + "-CCAP"; } else { /* No subtitles */ isdcf_name += "-XX"; } - if (_release_territory) { + if (_territory_type == TerritoryType::INTERNATIONAL_TEXTED) { + isdcf_name += "_INT-TD"; + } else if (_territory_type == TerritoryType::INTERNATIONAL_TEXTLESS) { + isdcf_name += "_INT-TL"; + } else if (_release_territory) { auto territory = _release_territory->subtag(); isdcf_name += "_" + to_upper (territory); if (!_ratings.empty()) { @@ -1003,7 +1021,7 @@ Film::isdcf_name (bool if_created_now) const } if (find_if(content_list.begin(), content_list.end(), [](shared_ptr c) { return static_cast(c->atmos); }) != content_list.end()) { - isdcf_name += "-ATMOS"; + isdcf_name += "-IAB"; } isdcf_name += "_" + resolution_to_string (_resolution); @@ -1033,19 +1051,19 @@ Film::isdcf_name (bool if_created_now) const } auto vf = false; - for (auto i: content_list) { - auto dc = dynamic_pointer_cast(i); - if (!dc) { + for (auto content: content_list) { + auto dcp = dynamic_pointer_cast(content); + if (!dcp) { continue; } bool any_text = false; for (int i = 0; i < static_cast(TextType::COUNT); ++i) { - if (dc->reference_text(static_cast(i))) { + if (dcp->reference_text(static_cast(i))) { any_text = true; } } - if (dc->reference_video() || dc->reference_audio() || any_text) { + if (dcp->reference_video() || dcp->reference_audio() || any_text) { vf = true; } } @@ -1081,21 +1099,21 @@ Film::set_directory (boost::filesystem::path d) void Film::set_name (string n) { - FilmChangeSignaller ch (this, Property::NAME); + FilmChangeSignaller ch(this, FilmProperty::NAME); _name = n; } void Film::set_use_isdcf_name (bool u) { - FilmChangeSignaller ch (this, Property::USE_ISDCF_NAME); + FilmChangeSignaller ch(this, FilmProperty::USE_ISDCF_NAME); _use_isdcf_name = u; } void Film::set_dcp_content_type (DCPContentType const * t) { - FilmChangeSignaller ch (this, Property::DCP_CONTENT_TYPE); + FilmChangeSignaller ch(this, FilmProperty::DCP_CONTENT_TYPE); _dcp_content_type = t; } @@ -1107,7 +1125,7 @@ Film::set_dcp_content_type (DCPContentType const * t) void Film::set_container (Ratio const * c, bool explicit_user) { - FilmChangeSignaller ch (this, Property::CONTAINER); + FilmChangeSignaller ch(this, FilmProperty::CONTAINER); _container = c; if (explicit_user) { @@ -1123,7 +1141,7 @@ Film::set_container (Ratio const * c, bool explicit_user) void Film::set_resolution (Resolution r, bool explicit_user) { - FilmChangeSignaller ch (this, Property::RESOLUTION); + FilmChangeSignaller ch(this, FilmProperty::RESOLUTION); _resolution = r; if (explicit_user) { @@ -1135,7 +1153,7 @@ Film::set_resolution (Resolution r, bool explicit_user) void Film::set_j2k_bandwidth (int b) { - FilmChangeSignaller ch (this, Property::J2K_BANDWIDTH); + FilmChangeSignaller ch(this, FilmProperty::J2K_BANDWIDTH); _j2k_bandwidth = b; } @@ -1146,7 +1164,7 @@ Film::set_j2k_bandwidth (int b) void Film::set_video_frame_rate (int f, bool user_explicit) { - FilmChangeSignaller ch (this, Property::VIDEO_FRAME_RATE); + FilmChangeSignaller ch(this, FilmProperty::VIDEO_FRAME_RATE); _video_frame_rate = f; if (user_explicit) { _user_explicit_video_frame_rate = true; @@ -1156,14 +1174,14 @@ Film::set_video_frame_rate (int f, bool user_explicit) void Film::set_audio_channels (int c) { - FilmChangeSignaller ch (this, Property::AUDIO_CHANNELS); + FilmChangeSignaller ch(this, FilmProperty::AUDIO_CHANNELS); _audio_channels = c; } void Film::set_three_d (bool t) { - FilmChangeSignaller ch (this, Property::THREE_D); + FilmChangeSignaller ch(this, FilmProperty::THREE_D); _three_d = t; if (_three_d && _two_d_version_of_three_d) { @@ -1174,22 +1192,31 @@ Film::set_three_d (bool t) void Film::set_interop (bool i) { - FilmChangeSignaller ch (this, Property::INTEROP); + FilmChangeSignaller ch(this, FilmProperty::INTEROP); _interop = i; } + +void +Film::set_limit_to_smpte_bv20(bool limit) +{ + FilmChangeSignaller ch(this, FilmProperty::LIMIT_TO_SMPTE_BV20); + _limit_to_smpte_bv20 = limit; +} + + void Film::set_audio_processor (AudioProcessor const * processor) { - FilmChangeSignaller ch1 (this, Property::AUDIO_PROCESSOR); - FilmChangeSignaller ch2 (this, Property::AUDIO_CHANNELS); + FilmChangeSignaller ch1(this, FilmProperty::AUDIO_PROCESSOR); + FilmChangeSignaller ch2(this, FilmProperty::AUDIO_CHANNELS); _audio_processor = processor; } void Film::set_reel_type (ReelType t) { - FilmChangeSignaller ch (this, Property::REEL_TYPE); + FilmChangeSignaller ch(this, FilmProperty::REEL_TYPE); _reel_type = t; } @@ -1197,30 +1224,30 @@ Film::set_reel_type (ReelType t) void Film::set_reel_length (int64_t r) { - FilmChangeSignaller ch (this, Property::REEL_LENGTH); + FilmChangeSignaller ch(this, FilmProperty::REEL_LENGTH); _reel_length = r; } void Film::set_reencode_j2k (bool r) { - FilmChangeSignaller ch (this, Property::REENCODE_J2K); + FilmChangeSignaller ch(this, FilmProperty::REENCODE_J2K); _reencode_j2k = r; } void Film::signal_change (ChangeType type, int p) { - signal_change (type, static_cast(p)); + signal_change(type, static_cast(p)); } void -Film::signal_change (ChangeType type, Property p) +Film::signal_change(ChangeType type, FilmProperty p) { if (type == ChangeType::DONE) { set_dirty (true); - if (p == Property::CONTENT) { + if (p == FilmProperty::CONTENT) { if (!_user_explicit_video_frame_rate) { set_video_frame_rate (best_video_frame_rate()); } @@ -1228,7 +1255,7 @@ Film::signal_change (ChangeType type, Property p) emit (boost::bind (boost::ref (Change), type, p)); - if (p == Property::VIDEO_FRAME_RATE || p == Property::SEQUENCE) { + if (p == FilmProperty::VIDEO_FRAME_RATE || p == FilmProperty::SEQUENCE) { /* We want to call Playlist::maybe_sequence but this must happen after the main signal emission (since the butler will see that emission and un-suspend itself). */ @@ -1273,12 +1300,6 @@ Film::j2c_path (int reel, Frame frame, Eyes eyes, bool tmp) const return file (p); } -static -bool -cpl_summary_compare (CPLSummary const & a, CPLSummary const & b) -{ - return a.last_write_time > b.last_write_time; -} /** Find all the DCPs in our directory that can be dcp::DCP::read() and return details of their CPLs. * The list will be returned in reverse order of timestamp (i.e. most recent first). @@ -1287,27 +1308,29 @@ vector Film::cpls () const { if (!directory ()) { - return vector (); + return {}; } vector out; auto const dir = directory().get(); - for (auto i: boost::filesystem::directory_iterator(dir)) { + for (auto const& item: dcp::filesystem::directory_iterator(dir)) { if ( - boost::filesystem::is_directory (i) && - i.path().leaf() != "j2c" && i.path().leaf() != "video" && i.path().leaf() != "info" && i.path().leaf() != "analysis" + dcp::filesystem::is_directory(item) && + item.path().filename() != "j2c" && item.path().filename() != "video" && item.path().filename() != "info" && item.path().filename() != "analysis" ) { try { - out.push_back (CPLSummary(i)); + out.push_back(CPLSummary(item)); } catch (...) { } } } - sort (out.begin(), out.end(), cpl_summary_compare); + sort(out.begin(), out.end(), [](CPLSummary const& a, CPLSummary const& b) { + return a.last_write_time > b.last_write_time; + }); return out; } @@ -1315,7 +1338,7 @@ Film::cpls () const void Film::set_encrypted (bool e) { - FilmChangeSignaller ch (this, Property::ENCRYPTED); + FilmChangeSignaller ch(this, FilmProperty::ENCRYPTED); _encrypted = e; } @@ -1391,7 +1414,9 @@ Film::add_content (shared_ptr c) maybe_set_container_and_resolution (); if (c->atmos) { - set_audio_channels (14); + if (_audio_channels < 14) { + set_audio_channels(14); + } set_interop (false); } } @@ -1402,23 +1427,23 @@ Film::maybe_set_container_and_resolution () { /* Get the only piece of video content, if there is only one */ shared_ptr video; - for (auto i: _playlist->content()) { - if (i->video) { + for (auto content: _playlist->content()) { + if (content->video) { if (!video) { - video = i->video; + video = content->video; } else { video.reset (); } } } - if (video) { + if (video && video->size()) { /* This is the only piece of video content in this Film. Use it to make a guess for * DCP container size and resolution, unless the user has already explicitly set these * things. */ if (!_user_explicit_container) { - if (video->size().ratio() > 2.3) { + if (video->size()->ratio() > 2.3) { set_container (Ratio::from_id("239"), false); } else { set_container (Ratio::from_id("185"), false); @@ -1426,7 +1451,7 @@ Film::maybe_set_container_and_resolution () } if (!_user_explicit_resolution) { - if (video->size_after_crop().width > 2048 || video->size_after_crop().height > 1080) { + if (video->size_after_crop()->width > 2048 || video->size_after_crop()->height > 1080) { set_resolution (Resolution::FOUR_K, false); } else { set_resolution (Resolution::TWO_K, false); @@ -1484,9 +1509,9 @@ void Film::playlist_content_change (ChangeType type, weak_ptr c, int p, bool frequent) { if (p == ContentProperty::VIDEO_FRAME_RATE) { - signal_change (type, Property::CONTENT); + signal_change(type, FilmProperty::CONTENT); } else if (p == AudioContentProperty::STREAMS) { - signal_change (type, Property::NAME); + signal_change(type, FilmProperty::NAME); } if (type == ChangeType::DONE) { @@ -1510,8 +1535,8 @@ Film::playlist_length_change () void Film::playlist_change (ChangeType type) { - signal_change (type, Property::CONTENT); - signal_change (type, Property::NAME); + signal_change(type, FilmProperty::CONTENT); + signal_change(type, FilmProperty::NAME); if (type == ChangeType::DONE) { check_settings_consistency (); @@ -1576,7 +1601,7 @@ void Film::playlist_order_changed () { /* XXX: missing PENDING */ - signal_change (ChangeType::DONE, Property::CONTENT_ORDER); + signal_change(ChangeType::DONE, FilmProperty::CONTENT_ORDER); } @@ -1587,7 +1612,7 @@ Film::set_sequence (bool s) return; } - FilmChangeSignaller cc (this, Property::SEQUENCE); + FilmChangeSignaller cc(this, FilmProperty::SEQUENCE); _sequence = s; _playlist->set_sequence (s); } @@ -1624,9 +1649,10 @@ Film::active_area () const for (auto i: content()) { if (i->video) { - dcp::Size s = i->video->scaled_size (frame); - active.width = max(active.width, s.width); - active.height = max(active.height, s.height); + if (auto s = i->video->scaled_size(frame)) { + active.width = max(active.width, s->width); + active.height = max(active.height, s->height); + } } } @@ -1634,37 +1660,18 @@ Film::active_area () const } -/** @param recipient KDM recipient certificate. - * @param trusted_devices Certificate thumbprints of other trusted devices (can be empty). - * @param cpl_file CPL filename. +/* @param cpl_file CPL filename. * @param from KDM from time expressed as a local time with an offset from UTC. * @param until KDM to time expressed as a local time with an offset from UTC. - * @param formulation KDM formulation to use. - * @param disable_forensic_marking_picture true to disable forensic marking of picture. - * @param disable_forensic_marking_audio if not set, don't disable forensic marking of audio. If set to 0, - * disable all forensic marking; if set above 0, disable forensic marking above that channel. */ -dcp::EncryptedKDM -Film::make_kdm ( - dcp::Certificate recipient, - vector trusted_devices, - boost::filesystem::path cpl_file, - dcp::LocalTime from, - dcp::LocalTime until, - dcp::Formulation formulation, - bool disable_forensic_marking_picture, - optional disable_forensic_marking_audio - ) const +dcp::DecryptedKDM +Film::make_kdm(boost::filesystem::path cpl_file, dcp::LocalTime from, dcp::LocalTime until) const { if (!_encrypted) { throw runtime_error (_("Cannot make a KDM as this project is not encrypted.")); } auto cpl = make_shared(cpl_file); - auto signer = Config::instance()->signer_chain(); - if (!signer->valid ()) { - throw InvalidSignerError (); - } /* Find keys that have been added to imported, encrypted DCP content */ list imported_keys; @@ -1679,31 +1686,31 @@ Film::make_kdm ( map, dcp::Key> keys; - for (auto i: cpl->reel_file_assets()) { - if (!i->encrypted()) { + for (auto asset: cpl->reel_file_assets()) { + if (!asset->encrypted()) { continue; } /* Get any imported key for this ID */ bool done = false; - for (auto j: imported_keys) { - if (j.id() == i->key_id().get()) { - LOG_GENERAL ("Using imported key for %1", i->key_id().get()); - keys[i] = j.key(); + for (auto const& k: imported_keys) { + if (k.id() == asset->key_id().get()) { + LOG_GENERAL("Using imported key for %1", asset->key_id().get()); + keys[asset] = k.key(); done = true; } } if (!done) { /* No imported key; it must be an asset that we encrypted */ - LOG_GENERAL ("Using our own key for %1", i->key_id().get()); - keys[i] = key(); + LOG_GENERAL("Using our own key for %1", asset->key_id().get()); + keys[asset] = key(); } } return dcp::DecryptedKDM ( cpl->id(), keys, from, until, cpl->content_title_text(), cpl->content_title_text(), dcp::LocalTime().as_string() - ).encrypt (signer, recipient, trusted_devices, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio); + ); } @@ -1734,15 +1741,15 @@ Film::should_be_enough_disk_space (double& required, double& available, bool& ca if (f) { f.close(); boost::system::error_code ec; - boost::filesystem::create_hard_link (test, test2, ec); + dcp::filesystem::create_hard_link(test, test2, ec); if (ec) { can_hard_link = false; } - boost::filesystem::remove (test); - boost::filesystem::remove (test2); + dcp::filesystem::remove(test); + dcp::filesystem::remove(test2); } - auto s = boost::filesystem::space (internal_video_asset_dir ()); + auto s = dcp::filesystem::space(internal_video_asset_dir()); required = double (required_disk_space ()) / 1073741824.0f; if (!can_hard_link) { required *= 2; @@ -1929,13 +1936,10 @@ Film::references_dcp_audio () const bool Film::contains_atmos_content () const { - for (auto i: _playlist->content()) { - if (i->atmos) { - return true; - } - } - - return false; + auto const content = _playlist->content(); + return std::find_if(content.begin(), content.end(), [](shared_ptr content) { + return static_cast(content->atmos); + }) != content.end(); } @@ -1944,10 +1948,10 @@ Film::closed_caption_tracks () const { list tt; for (auto i: content()) { - for (auto j: i->text) { + for (auto text: i->text) { /* XXX: Empty DCPTextTrack ends up being a magic value here - the "unknown" or "not specified" track */ - auto dtt = j->dcp_track().get_value_or(DCPTextTrack()); - if (j->type() == TextType::CLOSED_CAPTION && find(tt.begin(), tt.end(), dtt) == tt.end()) { + auto dtt = text->dcp_track().get_value_or(DCPTextTrack()); + if (text->type() == TextType::CLOSED_CAPTION && find(tt.begin(), tt.end(), dtt) == tt.end()) { tt.push_back (dtt); } } @@ -1959,7 +1963,7 @@ Film::closed_caption_tracks () const void Film::set_marker (dcp::Marker type, DCPTime time) { - FilmChangeSignaller ch (this, Property::MARKERS); + FilmChangeSignaller ch(this, FilmProperty::MARKERS); _markers[type] = time; } @@ -1967,7 +1971,7 @@ Film::set_marker (dcp::Marker type, DCPTime time) void Film::unset_marker (dcp::Marker type) { - FilmChangeSignaller ch (this, Property::MARKERS); + FilmChangeSignaller ch(this, FilmProperty::MARKERS); _markers.erase (type); } @@ -1975,7 +1979,7 @@ Film::unset_marker (dcp::Marker type) void Film::clear_markers () { - FilmChangeSignaller ch (this, Property::MARKERS); + FilmChangeSignaller ch(this, FilmProperty::MARKERS); _markers.clear (); } @@ -1983,14 +1987,14 @@ Film::clear_markers () void Film::set_ratings (vector r) { - FilmChangeSignaller ch (this, Property::RATINGS); + FilmChangeSignaller ch(this, FilmProperty::RATINGS); _ratings = r; } void Film::set_content_versions (vector v) { - FilmChangeSignaller ch (this, Property::CONTENT_VERSIONS); + FilmChangeSignaller ch(this, FilmProperty::CONTENT_VERSIONS); _content_versions = v; } @@ -1998,7 +2002,7 @@ Film::set_content_versions (vector v) void Film::set_name_language (dcp::LanguageTag lang) { - FilmChangeSignaller ch (this, Property::NAME_LANGUAGE); + FilmChangeSignaller ch(this, FilmProperty::NAME_LANGUAGE); _name_language = lang; } @@ -2006,7 +2010,7 @@ Film::set_name_language (dcp::LanguageTag lang) void Film::set_release_territory (optional region) { - FilmChangeSignaller ch (this, Property::RELEASE_TERRITORY); + FilmChangeSignaller ch(this, FilmProperty::RELEASE_TERRITORY); _release_territory = region; } @@ -2014,7 +2018,7 @@ Film::set_release_territory (optional region) void Film::set_status (dcp::Status s) { - FilmChangeSignaller ch (this, Property::STATUS); + FilmChangeSignaller ch(this, FilmProperty::STATUS); _status = s; } @@ -2022,7 +2026,7 @@ Film::set_status (dcp::Status s) void Film::set_version_number (int v) { - FilmChangeSignaller ch (this, Property::VERSION_NUMBER); + FilmChangeSignaller ch(this, FilmProperty::VERSION_NUMBER); _version_number = v; } @@ -2030,7 +2034,7 @@ Film::set_version_number (int v) void Film::set_chain (optional c) { - FilmChangeSignaller ch (this, Property::CHAIN); + FilmChangeSignaller ch(this, FilmProperty::CHAIN); _chain = c; } @@ -2038,7 +2042,7 @@ Film::set_chain (optional c) void Film::set_distributor (optional d) { - FilmChangeSignaller ch (this, Property::DISTRIBUTOR); + FilmChangeSignaller ch(this, FilmProperty::DISTRIBUTOR); _distributor = d; } @@ -2046,7 +2050,7 @@ Film::set_distributor (optional d) void Film::set_luminance (optional l) { - FilmChangeSignaller ch (this, Property::LUMINANCE); + FilmChangeSignaller ch(this, FilmProperty::LUMINANCE); _luminance = l; } @@ -2054,7 +2058,7 @@ Film::set_luminance (optional l) void Film::set_facility (optional f) { - FilmChangeSignaller ch (this, Property::FACILITY); + FilmChangeSignaller ch(this, FilmProperty::FACILITY); _facility = f; } @@ -2062,7 +2066,7 @@ Film::set_facility (optional f) void Film::set_studio (optional s) { - FilmChangeSignaller ch (this, Property::STUDIO); + FilmChangeSignaller ch(this, FilmProperty::STUDIO); _studio = s; } @@ -2085,10 +2089,10 @@ Film::info_file_handle (DCPTimePeriod period, bool read) const InfoFileHandle::InfoFileHandle (boost::mutex& mutex, boost::filesystem::path path, bool read) : _lock (mutex) - , _file (path, read ? "rb" : (boost::filesystem::exists(path) ? "r+b" : "wb")) + , _file(path, read ? "rb" : (dcp::filesystem::exists(path) ? "r+b" : "wb")) { if (!_file) { - throw OpenFileError (path, errno, read ? OpenFileError::READ : (boost::filesystem::exists(path) ? OpenFileError::READ_WRITE : OpenFileError::WRITE)); + throw OpenFileError(path, errno, read ? OpenFileError::READ : (dcp::filesystem::exists(path) ? OpenFileError::READ_WRITE : OpenFileError::WRITE)); } } @@ -2110,7 +2114,7 @@ Film::add_ffoc_lfoc (Markers& markers) const void Film::set_temp_version (bool t) { - FilmChangeSignaller ch (this, Property::TEMP_VERSION); + FilmChangeSignaller ch(this, FilmProperty::TEMP_VERSION); _temp_version = t; } @@ -2118,7 +2122,7 @@ Film::set_temp_version (bool t) void Film::set_pre_release (bool p) { - FilmChangeSignaller ch (this, Property::PRE_RELEASE); + FilmChangeSignaller ch(this, FilmProperty::PRE_RELEASE); _pre_release = p; } @@ -2126,7 +2130,7 @@ Film::set_pre_release (bool p) void Film::set_red_band (bool r) { - FilmChangeSignaller ch (this, Property::RED_BAND); + FilmChangeSignaller ch(this, FilmProperty::RED_BAND); _red_band = r; } @@ -2134,7 +2138,7 @@ Film::set_red_band (bool r) void Film::set_two_d_version_of_three_d (bool t) { - FilmChangeSignaller ch (this, Property::TWO_D_VERSION_OF_THREE_D); + FilmChangeSignaller ch(this, FilmProperty::TWO_D_VERSION_OF_THREE_D); _two_d_version_of_three_d = t; } @@ -2142,7 +2146,7 @@ Film::set_two_d_version_of_three_d (bool t) void Film::set_audio_language (optional language) { - FilmChangeSignaller ch (this, Property::AUDIO_LANGUAGE); + FilmChangeSignaller ch(this, FilmProperty::AUDIO_LANGUAGE); _audio_language = language; } @@ -2150,7 +2154,7 @@ Film::set_audio_language (optional language) void Film::set_audio_frame_rate (int rate) { - FilmChangeSignaller ch (this, Property::AUDIO_FRAME_RATE); + FilmChangeSignaller ch(this, FilmProperty::AUDIO_FRAME_RATE); _audio_frame_rate = rate; } @@ -2165,7 +2169,7 @@ Film::has_sign_language_video_channel () const void Film::set_sign_language_video_language (optional lang) { - FilmChangeSignaller ch (this, Property::SIGN_LANGUAGE_VIDEO_LANGUAGE); + FilmChangeSignaller ch(this, FilmProperty::SIGN_LANGUAGE_VIDEO_LANGUAGE); _sign_language_video_language = lang; } @@ -2218,3 +2222,11 @@ Film::last_written_by_earlier_than(int major, int minor, int micro) const return our_micro < micro; } + +void +Film::set_territory_type(TerritoryType type) +{ + FilmChangeSignaller ch(this, FilmProperty::TERRITORY_TYPE); + _territory_type = type; +} +