X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=0d277b82a0a8e92c1825eedc86dc6b08c7b3085c;hb=ccd69987ab861ea4521836fa2a5227e2dfac3479;hp=dacde49d4964283bfa1ea6e182e333a606c34af1;hpb=886c256f532e0f43bcd7f6f9924147c151293cab;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index dacde49d4..0d277b82a 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -18,57 +18,60 @@ */ + /** @file src/film.cc * @brief A representation of some audio, video and subtitle content, and details of * how they should be presented in a DCP. */ + #include "atmos_content.h" +#include "audio_content.h" +#include "audio_processor.h" +#include "change_signaller.h" +#include "check_content_change_job.h" +#include "cinema.h" +#include "compose.hpp" +#include "config.h" +#include "cross.h" +#include "dcp_content.h" +#include "dcp_content_type.h" +#include "dcp_encoder.h" +#include "dcpomatic_log.h" +#include "digester.h" +#include "environment_info.h" +#include "examine_content_job.h" +#include "exceptions.h" +#include "ffmpeg_content.h" +#include "ffmpeg_subtitle_stream.h" +#include "file_log.h" #include "film.h" +#include "font.h" #include "job.h" -#include "util.h" #include "job_manager.h" -#include "dcp_encoder.h" -#include "transcode_job.h" -#include "upload_job.h" +#include "kdm_with_metadata.h" #include "null_log.h" -#include "file_log.h" -#include "dcpomatic_log.h" -#include "exceptions.h" -#include "examine_content_job.h" -#include "config.h" #include "playlist.h" -#include "dcp_content_type.h" #include "ratio.h" -#include "cross.h" -#include "environment_info.h" -#include "audio_processor.h" -#include "digester.h" -#include "compose.hpp" #include "screen.h" -#include "audio_content.h" -#include "video_content.h" #include "text_content.h" -#include "ffmpeg_content.h" -#include "dcp_content.h" -#include "kdm_with_metadata.h" -#include "cinema.h" -#include "change_signaller.h" -#include "check_content_change_job.h" -#include "ffmpeg_subtitle_stream.h" -#include "font.h" +#include "transcode_job.h" +#include "upload_job.h" +#include "util.h" +#include "video_content.h" +#include "version.h" #include -#include #include -#include -#include +#include #include +#include #include -#include #include +#include +#include #include -#include #include +#include #include #include #include @@ -80,26 +83,27 @@ #include "i18n.h" -using std::string; -using std::pair; -using std::vector; -using std::setfill; -using std::min; -using std::max; -using std::make_pair; -using std::cout; -using std::list; -using std::set; -using std::runtime_error; -using std::copy; + using std::back_inserter; -using std::map; +using std::copy; +using std::cout; +using std::dynamic_pointer_cast; using std::exception; using std::find; +using std::list; +using std::make_pair; +using std::make_shared; +using std::map; +using std::max; +using std::min; +using std::pair; +using std::runtime_error; +using std::set; +using std::setfill; using std::shared_ptr; +using std::string; +using std::vector; using std::weak_ptr; -using std::make_shared; -using std::dynamic_pointer_cast; using boost::optional; using boost::is_any_of; #if BOOST_VERSION >= 106100 @@ -108,7 +112,9 @@ using namespace boost::placeholders; using dcp::raw_convert; using namespace dcpomatic; -string const Film::metadata_file = "metadata.xml"; + +static constexpr char metadata_file[] = "metadata.xml"; + /* 5 -> 6 * AudioMapping XML changed. @@ -141,6 +147,7 @@ string const Film::metadata_file = "metadata.xml"; */ int const Film::current_state_version = 38; + /** Construct a Film object in a given directory. * * @param dir Film directory. @@ -151,35 +158,45 @@ Film::Film (optional dir) , _use_isdcf_name (true) , _dcp_content_type (Config::instance()->default_dcp_content_type ()) , _container (Config::instance()->default_container ()) - , _resolution (RESOLUTION_2K) + , _resolution (Resolution::TWO_K) , _encrypted (false) , _context_id (dcp::make_uuid ()) , _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ()) - , _isdcf_metadata (Config::instance()->default_isdcf_metadata ()) , _video_frame_rate (24) , _audio_channels (Config::instance()->default_dcp_audio_channels ()) , _three_d (false) , _sequence (true) , _interop (Config::instance()->default_interop ()) , _audio_processor (0) - , _reel_type (REELTYPE_SINGLE) + , _reel_type (ReelType::SINGLE) , _reel_length (2000000000) , _reencode_j2k (false) , _user_explicit_video_frame_rate (false) , _user_explicit_container (false) , _user_explicit_resolution (false) , _name_language (dcp::LanguageTag("en-US")) - , _audio_language (dcp::LanguageTag("en-US")) - , _release_territory (dcp::LanguageTag::RegionSubtag("US")) , _version_number (1) , _status (dcp::Status::FINAL) - , _luminance (dcp::Luminance(4.5, dcp::Luminance::Unit::FOOT_LAMBERT)) , _state_version (current_state_version) , _dirty (false) , _tolerant (false) { set_isdcf_date_today (); + auto metadata = Config::instance()->default_metadata(); + if (metadata.find("chain") != metadata.end()) { + _chain = metadata["chain"]; + } + if (metadata.find("distributor") != metadata.end()) { + _distributor = metadata["distributor"]; + } + if (metadata.find("facility") != metadata.end()) { + _facility = metadata["facility"]; + } + if (metadata.find("studio") != metadata.end()) { + _studio = metadata["studio"]; + } + _playlist_change_connection = _playlist->Change.connect (bind (&Film::playlist_change, this, _1)); _playlist_order_changed_connection = _playlist->OrderChange.connect (bind (&Film::playlist_order_changed, this)); _playlist_content_change_connection = _playlist->ContentChange.connect (bind (&Film::playlist_content_change, this, _1, _2, _3, _4)); @@ -257,6 +274,10 @@ Film::video_identifier () const s += "_3D"; } + if (_reencode_j2k) { + s += "_R"; + } + return s; } @@ -288,13 +309,13 @@ Film::audio_analysis_path (shared_ptr playlist) const auto p = dir ("analysis"); Digester digester; - for (auto i: playlist->content ()) { + for (auto i: playlist->content()) { if (!i->audio) { continue; } - digester.add (i->digest ()); - digester.add (i->audio->mapping().digest ()); + digester.add (i->digest()); + digester.add (i->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 @@ -302,7 +323,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 (i->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()); } } @@ -434,6 +462,9 @@ Film::metadata (bool with_content_paths) const auto root = doc->create_root_node ("Metadata"); root->add_child("Version")->add_child_text (raw_convert (current_state_version)); + auto last_write = root->add_child("LastWrittenBy"); + last_write->add_child_text (dcpomatic_version); + last_write->set_attribute("git", dcpomatic_git_commit); root->add_child("Name")->add_child_text (_name); root->add_child("UseISDCFName")->add_child_text (_use_isdcf_name ? "1" : "0"); @@ -447,7 +478,6 @@ Film::metadata (bool with_content_paths) const root->add_child("Resolution")->add_child_text (resolution_to_string (_resolution)); 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)); root->add_child("ISDCFDate")->add_child_text (boost::gregorian::to_iso_string (_isdcf_date)); root->add_child("AudioChannels")->add_child_text (raw_convert (_audio_channels)); @@ -476,19 +506,38 @@ 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("AudioLanguage")->add_child_text(_audio_language.to_string()); - root->add_child("ReleaseTerritory")->add_child_text(_release_territory.subtag()); + if (_release_territory) { + root->add_child("ReleaseTerritory")->add_child_text(_release_territory->subtag()); + } + if (_sign_language_video_language) { + root->add_child("SignLanguageVideoLanguage")->add_child_text(_sign_language_video_language->to_string()); + } root->add_child("VersionNumber")->add_child_text(raw_convert(_version_number)); root->add_child("Status")->add_child_text(dcp::status_to_string(_status)); - root->add_child("Chain")->add_child_text(_chain); - root->add_child("Distributor")->add_child_text(_distributor); - root->add_child("Facility")->add_child_text(_facility); - root->add_child("LuminanceValue")->add_child_text(raw_convert(_luminance.value())); - root->add_child("LuminanceUnit")->add_child_text(dcp::Luminance::unit_to_string(_luminance.unit())); + if (_chain) { + root->add_child("Chain")->add_child_text(*_chain); + } + if (_distributor) { + root->add_child("Distributor")->add_child_text(*_distributor); + } + if (_facility) { + root->add_child("Facility")->add_child_text(*_facility); + } + if (_studio) { + root->add_child("Studio")->add_child_text(*_studio); + } + root->add_child("TempVersion")->add_child_text(_temp_version ? "1" : "0"); + root->add_child("PreRelease")->add_child_text(_pre_release ? "1" : "0"); + root->add_child("RedBand")->add_child_text(_red_band ? "1" : "0"); + root->add_child("TwoDVersionOfThreeD")->add_child_text(_two_d_version_of_three_d ? "1" : "0"); + if (_luminance) { + root->add_child("LuminanceValue")->add_child_text(raw_convert(_luminance->value())); + root->add_child("LuminanceUnit")->add_child_text(dcp::Luminance::unit_to_string(_luminance->unit())); + } root->add_child("UserExplicitContainer")->add_child_text(_user_explicit_container ? "1" : "0"); root->add_child("UserExplicitResolution")->add_child_text(_user_explicit_resolution ? "1" : "0"); - for (auto i: _subtitle_languages) { - root->add_child("SubtitleLanguage")->add_child_text(i.to_string()); + if (_audio_language) { + root->add_child("AudioLanguage")->add_child_text(_audio_language->to_string()); } _playlist->as_xml (root->add_child ("Playlist"), with_content_paths); @@ -559,11 +608,9 @@ Film::read_metadata (optional path) _name = f.string_child ("Name"); if (_state_version >= 9) { _use_isdcf_name = f.bool_child ("UseISDCFName"); - _isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata")); _isdcf_date = boost::gregorian::from_undelimited_string (f.string_child ("ISDCFDate")); } else { _use_isdcf_name = f.bool_child ("UseDCIName"); - _isdcf_metadata = ISDCFMetadata (f.node_child ("DCIMetadata")); _isdcf_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate")); } @@ -620,7 +667,7 @@ Film::read_metadata (optional path) } } - _reel_type = static_cast (f.optional_number_child("ReelType").get_value_or (static_cast(REELTYPE_SINGLE))); + _reel_type = static_cast (f.optional_number_child("ReelType").get_value_or (static_cast(ReelType::SINGLE))); _reel_length = f.optional_number_child("ReelLength").get_value_or (2000000000); _reencode_j2k = f.optional_bool_child("ReencodeJ2K").get_value_or(false); _user_explicit_video_frame_rate = f.optional_bool_child("UserExplicitVideoFrameRate").get_value_or(false); @@ -641,15 +688,16 @@ Film::read_metadata (optional path) if (name_language) { _name_language = dcp::LanguageTag (*name_language); } - auto audio_language = f.optional_string_child("AudioLanguage"); - if (audio_language) { - _audio_language = dcp::LanguageTag (*audio_language); - } auto release_territory = f.optional_string_child("ReleaseTerritory"); if (release_territory) { _release_territory = dcp::LanguageTag::RegionSubtag (*release_territory); } + auto sign_language_video_language = f.optional_string_child("SignLanguageVideoLanguage"); + if (sign_language_video_language) { + _sign_language_video_language = dcp::LanguageTag(*sign_language_video_language); + } + _version_number = f.optional_number_child("VersionNumber").get_value_or(0); auto status = f.optional_string_child("Status"); @@ -657,65 +705,71 @@ Film::read_metadata (optional path) _status = dcp::string_to_status (*status); } - _chain = f.optional_string_child("Chain").get_value_or(""); - _distributor = f.optional_string_child("Distributor").get_value_or(""); - _facility = f.optional_string_child("Facility").get_value_or(""); + _chain = f.optional_string_child("Chain"); + _distributor = f.optional_string_child("Distributor"); + _facility = f.optional_string_child("Facility"); + _studio = f.optional_string_child("Studio"); + _temp_version = f.optional_bool_child("TempVersion").get_value_or(false); + _pre_release = f.optional_bool_child("PreRelease").get_value_or(false); + _red_band = f.optional_bool_child("RedBand").get_value_or(false); + _two_d_version_of_three_d = f.optional_bool_child("TwoDVersionOfThreeD").get_value_or(false); - auto value = f.optional_number_child("LuminanceValue").get_value_or(4.5); + auto value = f.optional_number_child("LuminanceValue"); auto unit = f.optional_string_child("LuminanceUnit"); - if (unit) { - _luminance = dcp::Luminance (value, dcp::Luminance::string_to_unit(*unit)); + if (value && unit) { + _luminance = dcp::Luminance (*value, dcp::Luminance::string_to_unit(*unit)); } /* Disable guessing for files made in previous DCP-o-matic versions */ _user_explicit_container = f.optional_bool_child("UserExplicitContainer").get_value_or(true); _user_explicit_resolution = f.optional_bool_child("UserExplicitResolution").get_value_or(true); - for (auto i: f.node_children("SubtitleLanguage")) { - _subtitle_languages.push_back (dcp::LanguageTag(i->content())); - } - - list notes; - _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes); - - /* Write backtraces to this film's directory, until another film is loaded */ - if (_directory) { - set_backtrace_file (file ("backtrace.txt")); + auto audio_language = f.optional_string_child("AudioLanguage"); + if (audio_language) { + _audio_language = dcp::LanguageTag(*audio_language); } - /* Around 2.15.108 we removed subtitle language state from the text content and the ISDCF - * metadata and put it into the Film instead. If we've loaded an old Film let's try and fish - * out the settings from where they were so that they don't get lost. - */ - - optional found_language; - - for (auto i: f.node_child("Playlist")->node_children("Content")) { - auto text = i->optional_node_child("Text"); - if (text && text->optional_string_child("Language") && !found_language) { + /* Read the old ISDCFMetadata tag from 2.14.x metadata */ + auto isdcf = f.optional_node_child("ISDCFMetadata"); + if (isdcf) { + if (auto territory = isdcf->optional_string_child("Territory")) { try { - found_language = dcp::LanguageTag(text->string_child("Language")); - } catch (...) {} + _release_territory = dcp::LanguageTag::RegionSubtag(*territory); + } catch (...) { + /* Invalid region subtag; just ignore it */ + } } - } - - if (_state_version >= 9) { - auto isdcf_language = f.node_child("ISDCFMetadata")->optional_string_child("SubtitleLanguage"); - if (isdcf_language && !found_language) { + if (auto audio_language = isdcf->optional_string_child("AudioLanguage")) { try { - found_language = dcp::LanguageTag(*isdcf_language); + _audio_language = dcp::LanguageTag(*audio_language); } catch (...) { - try { - found_language = dcp::LanguageTag(boost::algorithm::to_lower_copy(*isdcf_language)); - } catch (...) { - - } + /* Invalid language tag; just ignore it */ } } + if (auto content_version = isdcf->optional_string_child("ContentVersion")) { + _content_versions.push_back (*content_version); + } + if (auto rating = isdcf->optional_string_child("Rating")) { + _ratings.push_back (dcp::Rating("", *rating)); + } + if (auto mastered_luminance = isdcf->optional_number_child("MasteredLuminance")) { + _luminance = dcp::Luminance(*mastered_luminance, dcp::Luminance::Unit::FOOT_LAMBERT); + } + _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"); + _chain = isdcf->optional_string_child("Chain"); } - if (found_language) { - _subtitle_languages.push_back (*found_language); + list notes; + _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes); + + /* Write backtraces to this film's directory, until another film is loaded */ + if (_directory) { + set_backtrace_file (file ("backtrace.txt")); } _dirty = false; @@ -784,6 +838,33 @@ Film::mapped_audio_channels () const return mapped; } + +pair, vector> +Film::subtitle_languages () const +{ + 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(); + } + } + } + if (i->video && i->video->burnt_subtitle_language()) { + result.first = i->video->burnt_subtitle_language(); + } + } + + std::sort (result.second.begin(), result.second.end()); + auto last = std::unique (result.second.begin(), result.second.end()); + result.second.erase (last, result.second.end()); + return result; +} + + /** @return a ISDCF-compliant name for a DCP of this film */ string Film::isdcf_name (bool if_created_now) const @@ -835,37 +916,49 @@ Film::isdcf_name (bool if_created_now) const if (dcp_content_type()) { d += "_" + dcp_content_type()->isdcf_name(); - d += "-" + raw_convert(isdcf_metadata().content_version); + string version = "1"; + if (_interop) { + if (!_content_versions.empty()) { + auto cv = _content_versions[0]; + if (!cv.empty() && std::all_of(cv.begin(), cv.end(), isdigit)) { + version = cv; + } + } + } else { + version = dcp::raw_convert(_version_number); + } + d += "-" + version; } - auto const dm = isdcf_metadata (); - - if (dm.temp_version) { + if (_temp_version) { d += "-Temp"; } - if (dm.pre_release) { + if (_pre_release) { d += "-Pre"; } - if (dm.red_band) { + if (_red_band) { d += "-RedBand"; } - if (!dm.chain.empty ()) { - d += "-" + dm.chain; + if (_chain && !_chain->empty()) { + d += "-" + *_chain; } if (three_d ()) { d += "-3D"; } - if (dm.two_d_version_of_three_d) { + if (_two_d_version_of_three_d) { d += "-2D"; } - if (!dm.mastered_luminance.empty ()) { - d += "-" + dm.mastered_luminance; + if (_luminance) { + auto fl = _luminance->value_in_foot_lamberts(); + char buffer[64]; + snprintf (buffer, sizeof(buffer), "%.1f", fl); + d += String::compose("-%1fl", buffer); } if (video_frame_rate() != 24) { @@ -880,64 +973,62 @@ Film::isdcf_name (bool if_created_now) const /* Interior aspect ratio. The standard says we don't do this for trailers, for some strange reason */ if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::ContentKind::TRAILER) { - Ratio const* content_ratio = nullptr; - for (auto i: content ()) { - if (i->video) { - /* Here's the first piece of video content */ - content_ratio = Ratio::nearest_from_ratio(i->video->scaled_size(frame_size()).ratio()); - break; + auto cl = content(); + auto first_video = std::find_if(cl.begin(), cl.end(), [](shared_ptr c) { return static_cast(c->video); }); + if (first_video != cl.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) { + d += "-" + dcp::raw_convert(first_ratio); } } - - if (content_ratio && content_ratio != container()) { - /* This needs to be the numeric version of the ratio, and ::id() is close enough */ - d += "-" + content_ratio->id(); - } } - if (!dm.audio_language.empty ()) { - d += "_" + dm.audio_language; + auto audio_language = (_audio_language && _audio_language->language()) ? _audio_language->language()->subtag() : "XX"; - /* 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. - */ + d += "_" + to_upper (audio_language); - auto burnt_in = true; - auto ccap = false; - for (auto i: content()) { - for (auto j: i->text) { - if (j->type() == TEXT_OPEN_SUBTITLE && j->use() && !j->burn()) { - burnt_in = false; - } else if (j->type() == TEXT_CLOSED_CAPTION && j->use()) { - ccap = true; - } - } - } + /* 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. + */ - if (!_subtitle_languages.empty()) { - auto lang = _subtitle_languages.front().language().get_value_or("en").subtag(); - if (burnt_in) { - transform (lang.begin(), lang.end(), lang.begin(), ::tolower); - } else { - transform (lang.begin(), lang.end(), lang.begin(), ::toupper); + auto burnt_in = true; + auto ccap = false; + for (auto i: content()) { + 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; } + } + } - d += "-" + lang; - if (ccap) { - d += "-CCAP"; - } + auto sub_langs = subtitle_languages(); + if (sub_langs.first && sub_langs.first->language()) { + auto lang = sub_langs.first->language()->subtag(); + if (burnt_in) { + transform (lang.begin(), lang.end(), lang.begin(), ::tolower); } else { - /* No subtitles */ - d += "-XX"; + lang = to_upper (lang); } + + d += "-" + lang; + if (ccap) { + d += "-CCAP"; + } + } else { + /* No subtitles */ + d += "-XX"; } - if (!dm.territory.empty ()) { - d += "_" + dm.territory; - if (dm.rating.empty ()) { + if (_release_territory) { + auto territory = _release_territory->subtag(); + d += "_" + to_upper (territory); + if (_ratings.empty ()) { d += "-NR"; } else { - d += "-" + dm.rating; + d += "-" + _ratings[0].label; } } @@ -961,8 +1052,8 @@ Film::isdcf_name (bool if_created_now) const d += "_" + resolution_to_string (_resolution); - if (!dm.studio.empty ()) { - d += "_" + dm.studio; + if (_studio && _studio->length() >= 2) { + d += "_" + to_upper (_studio->substr(0, 4)); } if (if_created_now) { @@ -971,8 +1062,8 @@ Film::isdcf_name (bool if_created_now) const d += "_" + boost::gregorian::to_iso_string (_isdcf_date); } - if (!dm.facility.empty ()) { - d += "_" + dm.facility; + if (_facility && _facility->length() >= 3) { + d += "_" + to_upper(_facility->substr(0, 3)); } if (_interop) { @@ -993,7 +1084,7 @@ Film::isdcf_name (bool if_created_now) const } bool any_text = false; - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::COUNT); ++i) { if (dc->reference_text(static_cast(i))) { any_text = true; } @@ -1034,21 +1125,21 @@ Film::set_directory (boost::filesystem::path d) void Film::set_name (string n) { - ChangeSignaller ch (this, NAME); + FilmChangeSignaller ch (this, Property::NAME); _name = n; } void Film::set_use_isdcf_name (bool u) { - ChangeSignaller ch (this, USE_ISDCF_NAME); + FilmChangeSignaller ch (this, Property::USE_ISDCF_NAME); _use_isdcf_name = u; } void Film::set_dcp_content_type (DCPContentType const * t) { - ChangeSignaller ch (this, DCP_CONTENT_TYPE); + FilmChangeSignaller ch (this, Property::DCP_CONTENT_TYPE); _dcp_content_type = t; } @@ -1060,7 +1151,7 @@ Film::set_dcp_content_type (DCPContentType const * t) void Film::set_container (Ratio const * c, bool explicit_user) { - ChangeSignaller ch (this, CONTAINER); + FilmChangeSignaller ch (this, Property::CONTAINER); _container = c; if (explicit_user) { @@ -1076,7 +1167,7 @@ Film::set_container (Ratio const * c, bool explicit_user) void Film::set_resolution (Resolution r, bool explicit_user) { - ChangeSignaller ch (this, RESOLUTION); + FilmChangeSignaller ch (this, Property::RESOLUTION); _resolution = r; if (explicit_user) { @@ -1088,17 +1179,10 @@ Film::set_resolution (Resolution r, bool explicit_user) void Film::set_j2k_bandwidth (int b) { - ChangeSignaller ch (this, J2K_BANDWIDTH); + FilmChangeSignaller ch (this, Property::J2K_BANDWIDTH); _j2k_bandwidth = b; } -void -Film::set_isdcf_metadata (ISDCFMetadata m) -{ - ChangeSignaller ch (this, ISDCF_METADATA); - _isdcf_metadata = m; -} - /** @param f New frame rate. * @param user_explicit true if this comes from a direct user instruction, false if it is from * DCP-o-matic being helpful. @@ -1106,7 +1190,7 @@ Film::set_isdcf_metadata (ISDCFMetadata m) void Film::set_video_frame_rate (int f, bool user_explicit) { - ChangeSignaller ch (this, VIDEO_FRAME_RATE); + FilmChangeSignaller ch (this, Property::VIDEO_FRAME_RATE); _video_frame_rate = f; if (user_explicit) { _user_explicit_video_frame_rate = true; @@ -1116,41 +1200,40 @@ Film::set_video_frame_rate (int f, bool user_explicit) void Film::set_audio_channels (int c) { - ChangeSignaller ch (this, AUDIO_CHANNELS); + FilmChangeSignaller ch (this, Property::AUDIO_CHANNELS); _audio_channels = c; } void Film::set_three_d (bool t) { - ChangeSignaller ch (this, THREE_D); + FilmChangeSignaller ch (this, Property::THREE_D); _three_d = t; - if (_three_d && _isdcf_metadata.two_d_version_of_three_d) { - ChangeSignaller ch (this, ISDCF_METADATA); - _isdcf_metadata.two_d_version_of_three_d = false; + if (_three_d && _two_d_version_of_three_d) { + set_two_d_version_of_three_d (false); } } void Film::set_interop (bool i) { - ChangeSignaller ch (this, INTEROP); + FilmChangeSignaller ch (this, Property::INTEROP); _interop = i; } void Film::set_audio_processor (AudioProcessor const * processor) { - ChangeSignaller ch1 (this, AUDIO_PROCESSOR); - ChangeSignaller ch2 (this, AUDIO_CHANNELS); + FilmChangeSignaller ch1 (this, Property::AUDIO_PROCESSOR); + FilmChangeSignaller ch2 (this, Property::AUDIO_CHANNELS); _audio_processor = processor; } void Film::set_reel_type (ReelType t) { - ChangeSignaller ch (this, REEL_TYPE); + FilmChangeSignaller ch (this, Property::REEL_TYPE); _reel_type = t; } @@ -1158,14 +1241,14 @@ Film::set_reel_type (ReelType t) void Film::set_reel_length (int64_t r) { - ChangeSignaller ch (this, REEL_LENGTH); + FilmChangeSignaller ch (this, Property::REEL_LENGTH); _reel_length = r; } void Film::set_reencode_j2k (bool r) { - ChangeSignaller ch (this, REENCODE_J2K); + FilmChangeSignaller ch (this, Property::REENCODE_J2K); _reencode_j2k = r; } @@ -1178,10 +1261,10 @@ Film::signal_change (ChangeType type, int p) void Film::signal_change (ChangeType type, Property p) { - if (type == CHANGE_TYPE_DONE) { + if (type == ChangeType::DONE) { _dirty = true; - if (p == Film::CONTENT) { + if (p == Property::CONTENT) { if (!_user_explicit_video_frame_rate) { set_video_frame_rate (best_video_frame_rate()); } @@ -1189,7 +1272,7 @@ Film::signal_change (ChangeType type, Property p) emit (boost::bind (boost::ref (Change), type, p)); - if (p == Film::VIDEO_FRAME_RATE || p == Film::SEQUENCE) { + if (p == Property::VIDEO_FRAME_RATE || p == Property::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). */ @@ -1217,9 +1300,9 @@ Film::j2c_path (int reel, Frame frame, Eyes eyes, bool tmp) const snprintf(buffer, sizeof(buffer), "%08d_%08" PRId64, reel, frame); string s (buffer); - if (eyes == EYES_LEFT) { + if (eyes == Eyes::LEFT) { s += ".L"; - } else if (eyes == EYES_RIGHT) { + } else if (eyes == Eyes::RIGHT) { s += ".R"; } @@ -1275,7 +1358,7 @@ Film::cpls () const void Film::set_encrypted (bool e) { - ChangeSignaller ch (this, ENCRYPTED); + FilmChangeSignaller ch (this, Property::ENCRYPTED); _encrypted = e; } @@ -1387,9 +1470,9 @@ Film::maybe_set_container_and_resolution () if (!_user_explicit_resolution) { if (video->size_after_crop().width > 2048 || video->size_after_crop().height > 1080) { - set_resolution (RESOLUTION_4K, false); + set_resolution (Resolution::FOUR_K, false); } else { - set_resolution (RESOLUTION_2K, false); + set_resolution (Resolution::TWO_K, false); } } } @@ -1444,12 +1527,12 @@ void Film::playlist_content_change (ChangeType type, weak_ptr c, int p, bool frequent) { if (p == ContentProperty::VIDEO_FRAME_RATE) { - signal_change (type, Film::CONTENT); + signal_change (type, Property::CONTENT); } else if (p == AudioContentProperty::STREAMS) { - signal_change (type, Film::NAME); + signal_change (type, Property::NAME); } - if (type == CHANGE_TYPE_DONE) { + if (type == ChangeType::DONE) { emit (boost::bind (boost::ref (ContentChange), type, c, p, frequent)); if (!frequent) { check_settings_consistency (); @@ -1470,10 +1553,10 @@ Film::playlist_length_change () void Film::playlist_change (ChangeType type) { - signal_change (type, CONTENT); - signal_change (type, NAME); + signal_change (type, Property::CONTENT); + signal_change (type, Property::NAME); - if (type == CHANGE_TYPE_DONE) { + if (type == ChangeType::DONE) { check_settings_consistency (); } @@ -1517,12 +1600,12 @@ Film::check_settings_consistency () d->set_reference_audio(false); change_made = true; } - if (d->reference_text(TEXT_OPEN_SUBTITLE) && !d->can_reference_text(shared_from_this(), TEXT_OPEN_SUBTITLE, why_not)) { - d->set_reference_text(TEXT_OPEN_SUBTITLE, false); + if (d->reference_text(TextType::OPEN_SUBTITLE) && !d->can_reference_text(shared_from_this(), TextType::OPEN_SUBTITLE, why_not)) { + d->set_reference_text(TextType::OPEN_SUBTITLE, false); change_made = true; } - if (d->reference_text(TEXT_CLOSED_CAPTION) && !d->can_reference_text(shared_from_this(), TEXT_CLOSED_CAPTION, why_not)) { - d->set_reference_text(TEXT_CLOSED_CAPTION, false); + if (d->reference_text(TextType::CLOSED_CAPTION) && !d->can_reference_text(shared_from_this(), TextType::CLOSED_CAPTION, why_not)) { + d->set_reference_text(TextType::CLOSED_CAPTION, false); change_made = true; } } @@ -1536,7 +1619,7 @@ void Film::playlist_order_changed () { /* XXX: missing PENDING */ - signal_change (CHANGE_TYPE_DONE, CONTENT_ORDER); + signal_change (ChangeType::DONE, Property::CONTENT_ORDER); } int @@ -1555,7 +1638,7 @@ Film::set_sequence (bool s) return; } - ChangeSignaller cc (this, SEQUENCE); + FilmChangeSignaller cc (this, Property::SEQUENCE); _sequence = s; _playlist->set_sequence (s); } @@ -1565,9 +1648,9 @@ dcp::Size Film::full_frame () const { switch (_resolution) { - case RESOLUTION_2K: + case Resolution::TWO_K: return dcp::Size (2048, 1080); - case RESOLUTION_4K: + case Resolution::FOUR_K: return dcp::Size (4096, 2160); } @@ -1648,7 +1731,7 @@ Film::make_kdm ( map, dcp::Key> keys; for (auto i: cpl->reel_file_assets()) { - if (!i->key_id()) { + if (!i->encrypted()) { continue; } @@ -1767,10 +1850,10 @@ Film::reels () const auto const len = length(); switch (reel_type ()) { - case REELTYPE_SINGLE: + case ReelType::SINGLE: p.push_back (DCPTimePeriod (DCPTime (), len)); break; - case REELTYPE_BY_VIDEO_CONTENT: + case ReelType::BY_VIDEO_CONTENT: { /* Collect all reel boundaries */ list split_points; @@ -1800,9 +1883,13 @@ Film::reels () const last = t; } } + + if (!p.empty()) { + p.back().to = split_points.back(); + } break; } - case REELTYPE_BY_LENGTH: + case ReelType::BY_LENGTH: { DCPTime current; /* Integer-divide reel length by the size of one frame to give the number of frames per reel, @@ -1834,7 +1921,7 @@ void Film::use_template (string name) { _template_film.reset (new Film (optional())); - _template_film->read_metadata (Config::instance()->template_path (name)); + _template_film->read_metadata (Config::instance()->template_read_path(name)); _use_isdcf_name = _template_film->_use_isdcf_name; _dcp_content_type = _template_film->_dcp_content_type; _container = _template_film->_container; @@ -1849,7 +1936,6 @@ Film::use_template (string name) _audio_processor = _template_film->_audio_processor; _reel_type = _template_film->_reel_type; _reel_length = _template_film->_reel_length; - _isdcf_metadata = _template_film->_isdcf_metadata; } pair @@ -1912,7 +1998,7 @@ Film::closed_caption_tracks () const for (auto j: 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() == TEXT_CLOSED_CAPTION && find(tt.begin(), tt.end(), dtt) == tt.end()) { + if (j->type() == TextType::CLOSED_CAPTION && find(tt.begin(), tt.end(), dtt) == tt.end()) { tt.push_back (dtt); } } @@ -1924,14 +2010,15 @@ Film::closed_caption_tracks () const void Film::set_marker (dcp::Marker type, DCPTime time) { - ChangeSignaller ch (this, MARKERS); + FilmChangeSignaller ch (this, Property::MARKERS); _markers[type] = time; } + void Film::unset_marker (dcp::Marker type) { - ChangeSignaller ch (this, MARKERS); + FilmChangeSignaller ch (this, Property::MARKERS); _markers.erase (type); } @@ -1939,7 +2026,7 @@ Film::unset_marker (dcp::Marker type) void Film::clear_markers () { - ChangeSignaller ch (this, MARKERS); + FilmChangeSignaller ch (this, Property::MARKERS); _markers.clear (); } @@ -1947,14 +2034,14 @@ Film::clear_markers () void Film::set_ratings (vector r) { - ChangeSignaller ch (this, RATINGS); + FilmChangeSignaller ch (this, Property::RATINGS); _ratings = r; } void Film::set_content_versions (vector v) { - ChangeSignaller ch (this, CONTENT_VERSIONS); + FilmChangeSignaller ch (this, Property::CONTENT_VERSIONS); _content_versions = v; } @@ -1962,23 +2049,15 @@ Film::set_content_versions (vector v) void Film::set_name_language (dcp::LanguageTag lang) { - ChangeSignaller ch (this, NAME_LANGUAGE); + FilmChangeSignaller ch (this, Property::NAME_LANGUAGE); _name_language = lang; } void -Film::set_audio_language (dcp::LanguageTag lang) +Film::set_release_territory (optional region) { - ChangeSignaller ch (this, AUDIO_LANGUAGE); - _audio_language = lang; -} - - -void -Film::set_release_territory (dcp::LanguageTag::RegionSubtag region) -{ - ChangeSignaller ch (this, RELEASE_TERRITORY); + FilmChangeSignaller ch (this, Property::RELEASE_TERRITORY); _release_territory = region; } @@ -1986,7 +2065,7 @@ Film::set_release_territory (dcp::LanguageTag::RegionSubtag region) void Film::set_status (dcp::Status s) { - ChangeSignaller ch (this, STATUS); + FilmChangeSignaller ch (this, Property::STATUS); _status = s; } @@ -1994,63 +2073,48 @@ Film::set_status (dcp::Status s) void Film::set_version_number (int v) { - ChangeSignaller ch (this, VERSION_NUMBER); + FilmChangeSignaller ch (this, Property::VERSION_NUMBER); _version_number = v; } void -Film::set_chain (string c) +Film::set_chain (optional c) { - ChangeSignaller ch (this, CHAIN); + FilmChangeSignaller ch (this, Property::CHAIN); _chain = c; } void -Film::set_distributor (string d) +Film::set_distributor (optional d) { - ChangeSignaller ch (this, DISTRIBUTOR); + FilmChangeSignaller ch (this, Property::DISTRIBUTOR); _distributor = d; } void -Film::set_luminance (dcp::Luminance l) +Film::set_luminance (optional l) { - ChangeSignaller ch (this, LUMINANCE); + FilmChangeSignaller ch (this, Property::LUMINANCE); _luminance = l; } void -Film::set_subtitle_language (dcp::LanguageTag language) -{ - set_subtitle_languages ({language}); -} - - -void -Film::unset_subtitle_language () -{ - ChangeSignaller ch (this, SUBTITLE_LANGUAGES); - _subtitle_languages.clear(); -} - - -void -Film::set_subtitle_languages (vector languages) +Film::set_facility (optional f) { - ChangeSignaller ch (this, SUBTITLE_LANGUAGES); - _subtitle_languages = languages; + FilmChangeSignaller ch (this, Property::FACILITY); + _facility = f; } void -Film::set_facility (string f) +Film::set_studio (optional s) { - ChangeSignaller ch (this, FACILITY); - _facility = f; + FilmChangeSignaller ch (this, Property::STUDIO); + _studio = s; } @@ -2111,3 +2175,59 @@ Film::add_ffoc_lfoc (Markers& markers) const markers[dcp::Marker::LFOC] = length() - DCPTime::from_frames(1, video_frame_rate()); } } + + +void +Film::set_temp_version (bool t) +{ + FilmChangeSignaller ch (this, Property::TEMP_VERSION); + _temp_version = t; +} + + +void +Film::set_pre_release (bool p) +{ + FilmChangeSignaller ch (this, Property::PRE_RELEASE); + _pre_release = p; +} + + +void +Film::set_red_band (bool r) +{ + FilmChangeSignaller ch (this, Property::RED_BAND); + _red_band = r; +} + + +void +Film::set_two_d_version_of_three_d (bool t) +{ + FilmChangeSignaller ch (this, Property::TWO_D_VERSION_OF_THREE_D); + _two_d_version_of_three_d = t; +} + + +void +Film::set_audio_language (optional language) +{ + FilmChangeSignaller ch (this, Property::AUDIO_LANGUAGE); + _audio_language = language; +} + + +bool +Film::has_sign_language_video_channel () const +{ + return _audio_channels >= static_cast(dcp::Channel::SIGN_LANGUAGE); +} + + +void +Film::set_sign_language_video_language (optional lang) +{ + FilmChangeSignaller ch (this, Property::SIGN_LANGUAGE_VIDEO_LANGUAGE); + _sign_language_video_language = lang; +} +