*/
+
/** @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 "cinema.h"
+#include "compose.hpp"
+#include "config.h"
+#include "constants.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 "video_content.h"
+#include "version.h"
#include <libcxml/cxml.h>
-#include <dcp/cpl.h>
#include <dcp/certificate_chain.h>
-#include <dcp/util.h>
-#include <dcp/local_time.h>
+#include <dcp/cpl.h>
#include <dcp/decrypted_kdm.h>
+#include <dcp/filesystem.h>
+#include <dcp/local_time.h>
#include <dcp/raw_convert.h>
-#include <dcp/reel_file_asset.h>
#include <dcp/reel_asset.h>
+#include <dcp/reel_file_asset.h>
+#include <dcp/util.h>
#include <libxml++/libxml++.h>
-#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
+#include <boost/filesystem.hpp>
#include <boost/regex.hpp>
#include <unistd.h>
-#include <stdexcept>
-#include <iostream>
#include <algorithm>
#include <cstdlib>
#include <iomanip>
+#include <iostream>
#include <set>
+#include <stdexcept>
#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
using dcp::raw_convert;
using namespace dcpomatic;
-string const Film::metadata_file = "metadata.xml";
+
+static constexpr char metadata_file[] = "metadata.xml";
+static constexpr char ui_state_file[] = "ui.xml";
+
/* 5 -> 6
* AudioMapping XML changed.
*/
int const Film::current_state_version = 38;
+
/** Construct a Film object in a given directory.
*
* @param dir Film directory.
Film::Film (optional<boost::filesystem::path> dir)
: _playlist (new Playlist)
- , _use_isdcf_name (true)
+ , _use_isdcf_name (Config::instance()->use_isdcf_name_by_default())
, _dcp_content_type (Config::instance()->default_dcp_content_type ())
- , _container (Config::instance()->default_container ())
+ , _container(Ratio::from_id("185"))
, _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 ())
+ , _limit_to_smpte_bv20(false)
, _audio_processor (0)
, _reel_type (ReelType::SINGLE)
, _reel_length (2000000000)
, _user_explicit_container (false)
, _user_explicit_resolution (false)
, _name_language (dcp::LanguageTag("en-US"))
- , _audio_language (dcp::LanguageTag("en-US"))
+ , _release_territory(Config::instance()->default_territory())
, _version_number (1)
, _status (dcp::Status::FINAL)
- , _luminance (dcp::Luminance(4.5, dcp::Luminance::Unit::FOOT_LAMBERT))
+ , _audio_language(Config::instance()->default_audio_language())
, _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));
_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) {
s += "_I";
} else {
s += "_S";
+ if (_limit_to_smpte_bv20) {
+ s += "_L20";
+ } else {
+ s += "_L21";
+ }
}
if (_three_d) {
s += "_3D";
}
+ if (_reencode_j2k) {
+ s += "_R";
+ }
+
return s;
}
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
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(content->position().get());
+ digester.add(content->trim_start().get());
+ digester.add(content->trim_end().get());
}
}
Digester digester;
digester.add (content->digest());
+ digester.add(_interop ? "1" : "0");
if (!content->text.empty()) {
auto tc = content->text.front();
}
-/** Add suitable Jobs to the JobManager to create a DCP for this Film.
- * @param gui true if this is being called from a GUI tool.
- * @param check true to check the content in the project for changes before making the DCP.
- */
-void
-Film::make_dcp (bool gui, bool check)
-{
- if (dcp_name().find ("/") != string::npos) {
- throw BadSettingError (_("name"), _("Cannot contain slashes"));
- }
-
- if (container() == nullptr) {
- throw MissingSettingError (_("container"));
- }
-
- if (content().empty()) {
- throw runtime_error (_("You must add some content to the DCP before creating it"));
- }
-
- if (length() == DCPTime()) {
- throw runtime_error (_("The DCP is empty, perhaps because all the content has zero length."));
- }
-
- if (dcp_content_type() == nullptr) {
- throw MissingSettingError (_("content type"));
- }
-
- if (name().empty()) {
- set_name ("DCP");
- }
-
- for (auto i: content ()) {
- if (!i->paths_valid()) {
- throw runtime_error (_("some of your content is missing"));
- }
- auto dcp = dynamic_pointer_cast<const DCPContent>(i);
- if (dcp && dcp->needs_kdm()) {
- throw runtime_error (_("Some of your content needs a KDM"));
- }
- if (dcp && dcp->needs_assets()) {
- throw runtime_error (_("Some of your content needs an OV"));
- }
- }
-
- set_isdcf_date_today ();
-
- for (auto i: environment_info ()) {
- LOG_GENERAL_NC (i);
- }
-
- for (auto i: content ()) {
- LOG_GENERAL ("Content: %1", i->technical_summary());
- }
- LOG_GENERAL ("DCP video rate %1 fps", video_frame_rate());
- if (Config::instance()->only_servers_encode ()) {
- LOG_GENERAL_NC ("0 threads: ONLY SERVERS SET TO ENCODE");
- } else {
- LOG_GENERAL ("%1 threads", Config::instance()->master_encoding_threads());
- }
- LOG_GENERAL ("J2K bandwidth %1", j2k_bandwidth());
-
- auto tj = make_shared<TranscodeJob>(shared_from_this());
- tj->set_encoder (make_shared<DCPEncoder>(shared_from_this(), tj));
- if (check) {
- auto cc = make_shared<CheckContentChangeJob>(shared_from_this(), tj, gui);
- JobManager::instance()->add (cc);
- } else {
- JobManager::instance()->add (tj);
- }
-}
-
/** Start a job to send our DCP to the configured TMS */
void
Film::send_dcp_to_tms ()
auto doc = make_shared<xmlpp::Document>();
auto root = doc->create_root_node ("Metadata");
- root->add_child("Version")->add_child_text (raw_convert<string> (current_state_version));
- root->add_child("Name")->add_child_text (_name);
- root->add_child("UseISDCFName")->add_child_text (_use_isdcf_name ? "1" : "0");
+ cxml::add_text_child(root, "Version", raw_convert<string>(current_state_version));
+ auto last_write = cxml::add_child(root, "LastWrittenBy");
+ last_write->add_child_text (dcpomatic_version);
+ last_write->set_attribute("git", dcpomatic_git_commit);
+ cxml::add_text_child(root, "Name", _name);
+ cxml::add_text_child(root, "UseISDCFName", _use_isdcf_name ? "1" : "0");
if (_dcp_content_type) {
- root->add_child("DCPContentType")->add_child_text (_dcp_content_type->isdcf_name ());
+ cxml::add_text_child(root, "DCPContentType", _dcp_content_type->isdcf_name());
}
if (_container) {
- root->add_child("Container")->add_child_text (_container->id ());
- }
-
- root->add_child("Resolution")->add_child_text (resolution_to_string (_resolution));
- root->add_child("J2KBandwidth")->add_child_text (raw_convert<string> (_j2k_bandwidth));
- _isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata"));
- root->add_child("VideoFrameRate")->add_child_text (raw_convert<string> (_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<string> (_audio_channels));
- 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("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);
+ cxml::add_text_child(root, "Container", _container->id());
+ }
+
+ cxml::add_text_child(root, "Resolution", resolution_to_string(_resolution));
+ cxml::add_text_child(root, "J2KBandwidth", raw_convert<string>(_j2k_bandwidth));
+ cxml::add_text_child(root, "VideoFrameRate", raw_convert<string>(_video_frame_rate));
+ cxml::add_text_child(root, "AudioFrameRate", raw_convert<string>(_audio_frame_rate));
+ cxml::add_text_child(root, "ISDCFDate", boost::gregorian::to_iso_string(_isdcf_date));
+ cxml::add_text_child(root, "AudioChannels", raw_convert<string>(_audio_channels));
+ cxml::add_text_child(root, "ThreeD", _three_d ? "1" : "0");
+ cxml::add_text_child(root, "Sequence", _sequence ? "1" : "0");
+ cxml::add_text_child(root, "Interop", _interop ? "1" : "0");
+ cxml::add_text_child(root, "LimitToSMPTEBv20", _limit_to_smpte_bv20 ? "1" : "0");
+ cxml::add_text_child(root, "Encrypted", _encrypted ? "1" : "0");
+ cxml::add_text_child(root, "Key", _key.hex ());
+ cxml::add_text_child(root, "ContextID", _context_id);
if (_audio_processor) {
- root->add_child("AudioProcessor")->add_child_text (_audio_processor->id ());
+ cxml::add_text_child(root, "AudioProcessor", _audio_processor->id());
+ }
+ cxml::add_text_child(root, "ReelType", raw_convert<string>(static_cast<int> (_reel_type)));
+ cxml::add_text_child(root, "ReelLength", raw_convert<string>(_reel_length));
+ for (auto boundary: _custom_reel_boundaries) {
+ cxml::add_text_child(root, "CustomReelBoundary", raw_convert<string>(boundary.get()));
}
- root->add_child("ReelType")->add_child_text (raw_convert<string> (static_cast<int> (_reel_type)));
- root->add_child("ReelLength")->add_child_text (raw_convert<string> (_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<dcp::Marker, DCPTime>::const_iterator i = _markers.begin(); i != _markers.end(); ++i) {
- auto m = root->add_child("Marker");
- m->set_attribute("Type", dcp::marker_to_string(i->first));
- m->add_child_text(raw_convert<string>(i->second.get()));
+ cxml::add_text_child(root, "ReencodeJ2K", _reencode_j2k ? "1" : "0");
+ cxml::add_text_child(root, "UserExplicitVideoFrameRate", _user_explicit_video_frame_rate ? "1" : "0");
+ for (auto const& marker: _markers) {
+ auto m = cxml::add_child(root, "Marker");
+ m->set_attribute("type", dcp::marker_to_string(marker.first));
+ m->add_child_text(raw_convert<string>(marker.second.get()));
}
for (auto i: _ratings) {
- i.as_xml (root->add_child("Rating"));
+ i.as_xml(cxml::add_child(root, "Rating"));
}
for (auto i: _content_versions) {
- root->add_child("ContentVersion")->add_child_text(i);
+ cxml::add_text_child(root, "ContentVersion", i);
}
- root->add_child("NameLanguage")->add_child_text(_name_language.to_string());
- root->add_child("AudioLanguage")->add_child_text(_audio_language.to_string());
+ cxml::add_text_child(root, "NameLanguage", _name_language.to_string());
+ cxml::add_text_child(root, "TerritoryType", territory_type_to_string(_territory_type));
if (_release_territory) {
- root->add_child("ReleaseTerritory")->add_child_text(_release_territory->subtag());
+ cxml::add_text_child(root, "ReleaseTerritory", _release_territory->subtag());
}
- root->add_child("VersionNumber")->add_child_text(raw_convert<string>(_version_number));
- root->add_child("Status")->add_child_text(dcp::status_to_string(_status));
+ if (_sign_language_video_language) {
+ cxml::add_text_child(root, "SignLanguageVideoLanguage", _sign_language_video_language->to_string());
+ }
+ cxml::add_text_child(root, "VersionNumber", raw_convert<string>(_version_number));
+ cxml::add_text_child(root, "Status", dcp::status_to_string(_status));
if (_chain) {
- root->add_child("Chain")->add_child_text(*_chain);
+ cxml::add_text_child(root, "Chain", *_chain);
}
if (_distributor) {
- root->add_child("Distributor")->add_child_text(*_distributor);
+ cxml::add_text_child(root, "Distributor", *_distributor);
}
if (_facility) {
- root->add_child("Facility")->add_child_text(*_facility);
+ cxml::add_text_child(root, "Facility", *_facility);
}
if (_studio) {
- root->add_child("Studio")->add_child_text(*_studio);
+ cxml::add_text_child(root, "Studio", *_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");
+ cxml::add_text_child(root, "TempVersion", _temp_version ? "1" : "0");
+ cxml::add_text_child(root, "PreRelease", _pre_release ? "1" : "0");
+ cxml::add_text_child(root, "RedBand", _red_band ? "1" : "0");
+ cxml::add_text_child(root, "TwoDVersionOfThreeD", _two_d_version_of_three_d ? "1" : "0");
if (_luminance) {
- root->add_child("LuminanceValue")->add_child_text(raw_convert<string>(_luminance->value()));
- root->add_child("LuminanceUnit")->add_child_text(dcp::Luminance::unit_to_string(_luminance->unit()));
+ cxml::add_text_child(root, "LuminanceValue", raw_convert<string>(_luminance->value()));
+ cxml::add_text_child(root, "LuminanceUnit", dcp::Luminance::unit_to_string(_luminance->unit()));
+ }
+ cxml::add_text_child(root, "UserExplicitContainer", _user_explicit_container ? "1" : "0");
+ cxml::add_text_child(root, "UserExplicitResolution", _user_explicit_resolution ? "1" : "0");
+ if (_audio_language) {
+ cxml::add_text_child(root, "AudioLanguage", _audio_language->to_string());
}
- root->add_child("UserExplicitContainer")->add_child_text(_user_explicit_container ? "1" : "0");
- root->add_child("UserExplicitResolution")->add_child_text(_user_explicit_resolution ? "1" : "0");
- _playlist->as_xml (root->add_child ("Playlist"), with_content_paths);
+ _playlist->as_xml(cxml::add_child(root, "Playlist"), with_content_paths);
return doc;
}
/** Write state to our `metadata' file */
void
-Film::write_metadata () const
+Film::write_metadata ()
{
DCPOMATIC_ASSERT (directory());
- boost::filesystem::create_directories (directory().get());
- metadata()->write_to_file_formatted(file(metadata_file).string());
- _dirty = false;
+ 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);
}
/** Write a template from this film */
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<xmlpp::Document> doc = metadata (false);
metadata(false)->write_to_file_formatted(path.string());
}
Film::read_metadata (optional<boost::filesystem::path> 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<int> ("Version");
if (_state_version > current_state_version) {
} 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 */
}
}
}
+ _last_written_by = f.optional_string_child("LastWrittenBy");
+
_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"));
}
_resolution = string_to_resolution (f.string_child ("Resolution"));
_j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
_video_frame_rate = f.number_child<int> ("VideoFrameRate");
+ _audio_frame_rate = f.optional_number_child<int>("AudioFrameRate").get_value_or(48000);
_encrypted = f.bool_child ("Encrypted");
_audio_channels = f.number_child<int> ("AudioChannels");
/* We used to allow odd numbers (and zero) channels, but it's just not worth
_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 ());
_reel_type = static_cast<ReelType> (f.optional_number_child<int>("ReelType").get_value_or (static_cast<int>(ReelType::SINGLE)));
_reel_length = f.optional_number_child<int64_t>("ReelLength").get_value_or (2000000000);
+ for (auto boundary: f.node_children("CustomReelBoundary")) {
+ _custom_reel_boundaries.push_back(DCPTime(raw_convert<int64_t>(boundary->content())));
+ }
_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);
for (auto i: f.node_children("Marker")) {
- _markers[dcp::marker_from_string(i->string_attribute("Type"))] = DCPTime(dcp::raw_convert<DCPTime::Type>(i->content()));
+ auto type = i->optional_string_attribute("Type");
+ if (!type) {
+ type = i->string_attribute("type");
+ }
+ _markers[dcp::marker_from_string(*type)] = DCPTime(dcp::raw_convert<DCPTime::Type>(i->content()));
}
for (auto i: f.node_children("Rating")) {
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 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);
}
- _version_number = f.optional_number_child<int>("VersionNumber").get_value_or(0);
+ 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<int>("VersionNumber").get_value_or(1);
auto status = f.optional_string_child("Status");
if (status) {
_user_explicit_container = f.optional_bool_child("UserExplicitContainer").get_value_or(true);
_user_explicit_resolution = f.optional_bool_child("UserExplicitResolution").get_value_or(true);
+ auto audio_language = f.optional_string_child("AudioLanguage");
+ if (audio_language) {
+ _audio_language = dcp::LanguageTag(*audio_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 {
+ _release_territory = dcp::LanguageTag::RegionSubtag(*territory);
+ } catch (...) {
+ /* Invalid region subtag; just ignore it */
+ }
+ }
+ if (auto audio_language = isdcf->optional_string_child("AudioLanguage")) {
+ try {
+ _audio_language = dcp::LanguageTag(*audio_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<float>("MasteredLuminance")) {
+ if (*mastered_luminance > 0) {
+ _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");
+ }
+
list<string> notes;
_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes);
set_backtrace_file (file ("backtrace.txt"));
}
- _dirty = false;
+ set_dirty (false);
return notes;
}
p /= d;
if (create) {
- boost::filesystem::create_directories (p);
+ dcp::filesystem::create_directories(p);
}
return p;
p /= _directory.get();
p /= f;
- boost::filesystem::create_directories (p.parent_path ());
+ dcp::filesystem::create_directories(p.parent_path());
return p;
}
}
-vector<dcp::LanguageTag>
-Film::audio_languages () const
+pair<optional<dcp::LanguageTag>, vector<dcp::LanguageTag>>
+Film::subtitle_languages(bool* burnt_in) const
{
- vector<dcp::LanguageTag> result;
- for (auto i: content()) {
- if (i->audio && !i->audio->mapping().mapped_output_channels().empty() && i->audio->language()) {
- result.push_back (i->audio->language().get());
- }
+ if (burnt_in) {
+ *burnt_in = true;
}
- std::sort (result.begin(), result.end());
- auto last = std::unique (result.begin(), result.end());
- result.erase (last, result.end());
- return result;
-}
-
-
-pair<optional<dcp::LanguageTag>, vector<dcp::LanguageTag>>
-Film::subtitle_languages () const
-{
pair<optional<dcp::LanguageTag>, vector<dcp::LanguageTag>> 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<DCPContent>(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();
+ }
}
}
}
}
+vector<dcp::LanguageTag>
+Film::closed_caption_languages() const
+{
+ vector<dcp::LanguageTag> 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
{
- string d;
+ string isdcf_name;
auto raw_name = name ();
+ auto to_upper = [](string s) {
+ transform(s.begin(), s.end(), s.begin(), ::toupper);
+ return s;
+ };
+
/* Split the raw name up into words */
vector<string> words;
split (words, raw_name, is_any_of (" _-"));
}
}
- if (fixed_name.length() > 14) {
- fixed_name = fixed_name.substr (0, 14);
- }
+ fixed_name = fixed_name.substr(0, Config::instance()->isdcf_name_part_length());
- d += fixed_name;
+ isdcf_name += fixed_name;
if (dcp_content_type()) {
- d += "_" + dcp_content_type()->isdcf_name();
+ isdcf_name += "_" + dcp_content_type()->isdcf_name();
string version = "1";
if (_interop) {
if (!_content_versions.empty()) {
} else {
version = dcp::raw_convert<string>(_version_number);
}
- d += "-" + version;
+ isdcf_name += "-" + version;
}
- auto const dm = isdcf_metadata ();
-
if (_temp_version) {
- d += "-Temp";
+ isdcf_name += "-Temp";
}
if (_pre_release) {
- d += "-Pre";
+ isdcf_name += "-Pre";
}
if (_red_band) {
- d += "-RedBand";
+ isdcf_name += "-RedBand";
}
if (_chain && !_chain->empty()) {
- d += "-" + *_chain;
+ isdcf_name += "-" + *_chain;
}
if (three_d ()) {
- d += "-3D";
+ isdcf_name += "-3D";
}
if (_two_d_version_of_three_d) {
- d += "-2D";
+ isdcf_name += "-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);
+ isdcf_name += String::compose("-%1fl", buffer);
}
if (video_frame_rate() != 24) {
- d += "-" + raw_convert<string>(video_frame_rate());
+ isdcf_name += "-" + raw_convert<string>(video_frame_rate());
}
if (container()) {
- d += "_" + container()->isdcf_name();
+ isdcf_name += "_" + container()->isdcf_name();
}
+ auto content_list = content();
+
/* XXX: this uses the first bit of content only */
/* 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 first_video = std::find_if(content_list.begin(), content_list.end(), [](shared_ptr<Content> c) { return static_cast<bool>(c->video); });
+ if (first_video != content_list.end()) {
+ 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<string>(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();
- }
}
- auto audio_langs = audio_languages();
- auto audio_language = (audio_langs.empty() || !audio_langs.front().language()) ? "XX" : audio_langs.front().language()->subtag();
-
- d += "_" + 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()) {
- 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 entry_for_language = [](dcp::LanguageTag const& tag) {
+ /* Look up what we should be using for this tag in the DCNC name */
+ for (auto const& dcnc: dcp::dcnc_tags()) {
+ if (tag.to_string() == dcnc.first) {
+ return dcnc.second;
}
}
- }
+ /* Fallback to the language subtag, if there is one */
+ return tag.language() ? tag.language()->subtag() : "XX";
+ };
+
+ auto audio_language = _audio_language ? entry_for_language(*_audio_language) : "XX";
- auto sub_langs = subtitle_languages();
+ isdcf_name += "_" + to_upper (audio_language);
+
+ 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 = sub_langs.first->language()->subtag();
+ auto lang = entry_for_language(*sub_langs.first);
if (burnt_in) {
transform (lang.begin(), lang.end(), lang.begin(), ::tolower);
} else {
lang = to_upper (lang);
}
- d += "-" + lang;
- if (ccap) {
- d += "-CCAP";
- }
+ isdcf_name += "-" + lang;
+ } else if (!ccap_langs.empty()) {
+ isdcf_name += "-" + to_upper(entry_for_language(ccap_langs[0])) + "-CCAP";
} else {
/* No subtitles */
- d += "-XX";
+ 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();
- d += "_" + to_upper (territory);
- if (_ratings.empty ()) {
- d += "-NR";
- } else {
- d += "-" + _ratings[0].label;
+ isdcf_name += "_" + to_upper (territory);
+ if (!_ratings.empty()) {
+ auto label = _ratings[0].label;
+ boost::erase_all(label, "+");
+ boost::erase_all(label, "-");
+ isdcf_name += "-" + label;
}
}
auto ch = audio_channel_types (mapped, audio_channels());
if (!ch.first && !ch.second) {
- d += "_MOS";
+ isdcf_name += "_MOS";
} else if (ch.first) {
- d += String::compose("_%1%2", ch.first, ch.second);
+ isdcf_name += String::compose("_%1%2", ch.first, ch.second);
}
if (audio_channels() > static_cast<int>(dcp::Channel::HI) && find(mapped.begin(), mapped.end(), static_cast<int>(dcp::Channel::HI)) != mapped.end()) {
- d += "-HI";
+ isdcf_name += "-HI";
}
if (audio_channels() > static_cast<int>(dcp::Channel::VI) && find(mapped.begin(), mapped.end(), static_cast<int>(dcp::Channel::VI)) != mapped.end()) {
- d += "-VI";
+ isdcf_name += "-VI";
+ }
+
+ if (find_if(content_list.begin(), content_list.end(), [](shared_ptr<Content> c) { return static_cast<bool>(c->atmos); }) != content_list.end()) {
+ isdcf_name += "-IAB";
}
- d += "_" + resolution_to_string (_resolution);
+ isdcf_name += "_" + resolution_to_string (_resolution);
if (_studio && _studio->length() >= 2) {
- d += "_" + to_upper (_studio->substr(0, 4));
+ isdcf_name += "_" + to_upper (_studio->substr(0, 4));
}
if (if_created_now) {
- d += "_" + boost::gregorian::to_iso_string (boost::gregorian::day_clock::local_day ());
+ isdcf_name += "_" + boost::gregorian::to_iso_string (boost::gregorian::day_clock::local_day ());
} else {
- d += "_" + boost::gregorian::to_iso_string (_isdcf_date);
+ isdcf_name += "_" + boost::gregorian::to_iso_string (_isdcf_date);
}
if (_facility && _facility->length() >= 3) {
- d += "_" + to_upper(_facility->substr(0, 3));
+ isdcf_name += "_" + to_upper(_facility->substr(0, 3));
}
if (_interop) {
- d += "_IOP";
+ isdcf_name += "_IOP";
} else {
- d += "_SMPTE";
+ isdcf_name += "_SMPTE";
}
if (three_d ()) {
- d += "-3D";
+ isdcf_name += "-3D";
}
auto vf = false;
- for (auto i: content()) {
- auto dc = dynamic_pointer_cast<const DCPContent>(i);
- if (!dc) {
+ for (auto content: content_list) {
+ auto dcp = dynamic_pointer_cast<const DCPContent>(content);
+ if (!dcp) {
continue;
}
bool any_text = false;
for (int i = 0; i < static_cast<int>(TextType::COUNT); ++i) {
- if (dc->reference_text(static_cast<TextType>(i))) {
+ if (dcp->reference_text(static_cast<TextType>(i))) {
any_text = true;
}
}
- if (dc->reference_video() || dc->reference_audio() || any_text) {
+ if (dcp->reference_video() || dcp->reference_audio() || any_text) {
vf = true;
}
}
if (vf) {
- d += "_VF";
+ isdcf_name += "_VF";
} else {
- d += "_OV";
+ isdcf_name += "_OV";
}
- return d;
+ return isdcf_name;
}
/** @return name to give the DCP */
Film::set_directory (boost::filesystem::path d)
{
_directory = d;
- _dirty = true;
+ set_dirty (true);
}
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;
}
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) {
void
Film::set_resolution (Resolution r, bool explicit_user)
{
- FilmChangeSignaller ch (this, Property::RESOLUTION);
+ FilmChangeSignaller ch(this, FilmProperty::RESOLUTION);
_resolution = r;
if (explicit_user) {
void
Film::set_j2k_bandwidth (int b)
{
- FilmChangeSignaller ch (this, Property::J2K_BANDWIDTH);
+ FilmChangeSignaller ch(this, FilmProperty::J2K_BANDWIDTH);
_j2k_bandwidth = b;
}
-void
-Film::set_isdcf_metadata (ISDCFMetadata m)
-{
- FilmChangeSignaller ch (this, Property::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.
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;
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) {
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;
}
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_custom_reel_boundaries(vector<DCPTime> boundaries)
+{
+ FilmChangeSignaller ch(this, FilmProperty::CUSTOM_REEL_BOUNDARIES);
+ std::sort(boundaries.begin(), boundaries.end());
+ _custom_reel_boundaries = std::move(boundaries);
+}
+
+
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<Property>(p));
+ signal_change(type, static_cast<FilmProperty>(p));
}
void
-Film::signal_change (ChangeType type, Property p)
+Film::signal_change(ChangeType type, FilmProperty p)
{
if (type == ChangeType::DONE) {
- _dirty = true;
+ 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());
}
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).
*/
_isdcf_date = boost::gregorian::day_clock::local_day ();
}
+
boost::filesystem::path
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).
Film::cpls () const
{
if (!directory ()) {
- return vector<CPLSummary> ();
+ return {};
}
vector<CPLSummary> 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;
}
void
Film::set_encrypted (bool e)
{
- FilmChangeSignaller ch (this, Property::ENCRYPTED);
+ FilmChangeSignaller ch(this, FilmProperty::ENCRYPTED);
_encrypted = e;
}
maybe_set_container_and_resolution ();
if (c->atmos) {
- set_audio_channels (14);
+ if (_audio_channels < 14) {
+ set_audio_channels(14);
+ }
set_interop (false);
}
}
{
/* Get the only piece of video content, if there is only one */
shared_ptr<VideoContent> 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);
}
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);
Film::playlist_content_change (ChangeType type, weak_ptr<Content> 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) {
ContentChange (type, c, p, frequent);
}
- _dirty = true;
+ set_dirty (true);
}
void
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 ();
}
- _dirty = true;
+ set_dirty (true);
}
/** Check for (and if necessary fix) impossible settings combinations, like
if (change_made) {
Message (_("DCP-o-matic had to change your settings for referring to DCPs as OV. Please review those settings to make sure they are what you want."));
}
+
+ if (reel_type() == ReelType::CUSTOM) {
+ auto boundaries = custom_reel_boundaries();
+ auto too_late = std::find_if(boundaries.begin(), boundaries.end(), [this](dcpomatic::DCPTime const& time) {
+ return time >= length();
+ });
+
+ if (too_late != boundaries.end()) {
+ if (std::distance(too_late, boundaries.end()) > 1) {
+ Message(_("DCP-o-matic had to remove some of your custom reel boundaries as they no longer lie within the film."));
+ } else {
+ Message(_("DCP-o-matic had to remove one of your custom reel boundaries as it no longer lies within the film."));
+ }
+ boundaries.erase(too_late, boundaries.end());
+ set_custom_reel_boundaries(boundaries);
+ }
+ }
}
void
Film::playlist_order_changed ()
{
/* XXX: missing PENDING */
- signal_change (ChangeType::DONE, Property::CONTENT_ORDER);
+ signal_change(ChangeType::DONE, FilmProperty::CONTENT_ORDER);
}
-int
-Film::audio_frame_rate () const
-{
- /* It seems that nobody makes 96kHz DCPs at the moment, so let's avoid them.
- See #1436.
- */
- return 48000;
-}
void
Film::set_sequence (bool s)
return;
}
- FilmChangeSignaller cc (this, Property::SEQUENCE);
+ FilmChangeSignaller cc(this, FilmProperty::SEQUENCE);
_sequence = s;
_playlist->set_sequence (s);
}
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);
+ }
}
}
}
-/** @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<string> trusted_devices,
- boost::filesystem::path cpl_file,
- dcp::LocalTime from,
- dcp::LocalTime until,
- dcp::Formulation formulation,
- bool disable_forensic_marking_picture,
- optional<int> 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<dcp::CPL>(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<dcp::DecryptedKDMKey> imported_keys;
map<shared_ptr<const dcp::ReelFileAsset>, dcp::Key> keys;
- for (auto i: cpl->reel_file_assets()) {
- if (!i->key_id()) {
+ 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);
+ );
}
boost::filesystem::path test = internal_video_asset_dir() / "test";
boost::filesystem::path test2 = internal_video_asset_dir() / "test2";
can_hard_link = true;
- auto f = fopen_boost (test, "w");
+ dcp::File f(test, "w");
if (f) {
- fclose (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;
vector<NamedChannel> n;
for (int i = 0; i < audio_channels(); ++i) {
- if (i != 8 && i != 9 && i != 15) {
+ if (Config::instance()->use_all_audio_channels() || (i != 8 && i != 9 && i != 15)) {
n.push_back (NamedChannel(short_audio_channel_name(i), i));
}
}
/* XXX */
}
-list<DCPTimePeriod>
+
+vector<DCPTimePeriod>
Film::reels () const
{
- list<DCPTimePeriod> p;
+ vector<DCPTimePeriod> periods;
auto const len = length();
switch (reel_type ()) {
case ReelType::SINGLE:
- p.push_back (DCPTimePeriod (DCPTime (), len));
+ periods.emplace_back(DCPTime(), len);
break;
case ReelType::BY_VIDEO_CONTENT:
{
for (auto t: split_points) {
if (last && (t - *last) >= DCPTime::from_seconds(1)) {
/* Period from *last to t is long enough; use it and start a new one */
- p.push_back (DCPTimePeriod(*last, t));
+ periods.emplace_back(*last, t);
last = t;
} else if (!last) {
/* That was the first time, so start a new period */
}
}
- if (!p.empty()) {
- p.back().to = split_points.back();
+ if (!periods.empty()) {
+ periods.back().to = split_points.back();
}
break;
}
Frame const reel_in_frames = max(_reel_length / ((j2k_bandwidth() / video_frame_rate()) / 8), static_cast<Frame>(video_frame_rate()));
while (current < len) {
DCPTime end = min (len, current + DCPTime::from_frames (reel_in_frames, video_frame_rate ()));
- p.push_back (DCPTimePeriod (current, end));
+ periods.emplace_back(current, end);
current = end;
}
break;
}
+ case ReelType::CUSTOM:
+ {
+ DCPTimePeriod current;
+ for (auto boundary: _custom_reel_boundaries) {
+ current.to = boundary;
+ periods.push_back(current);
+ current.from = boundary;
+ }
+ current.to = len;
+ periods.push_back(current);
+ break;
+ }
}
- return p;
+ return periods;
}
+
/** @param period A period within the DCP
* @return Name of the content which most contributes to the given period.
*/
Film::use_template (string name)
{
_template_film.reset (new Film (optional<boost::filesystem::path>()));
- _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;
_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<double, double>
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<const Content> content) {
+ return static_cast<bool>(content->atmos);
+ }) != content.end();
}
{
list<DCPTextTrack> 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);
}
}
void
Film::set_marker (dcp::Marker type, DCPTime time)
{
- FilmChangeSignaller ch (this, Property::MARKERS);
+ FilmChangeSignaller ch(this, FilmProperty::MARKERS);
_markers[type] = time;
}
void
Film::unset_marker (dcp::Marker type)
{
- FilmChangeSignaller ch (this, Property::MARKERS);
+ FilmChangeSignaller ch(this, FilmProperty::MARKERS);
_markers.erase (type);
}
void
Film::clear_markers ()
{
- FilmChangeSignaller ch (this, Property::MARKERS);
+ FilmChangeSignaller ch(this, FilmProperty::MARKERS);
_markers.clear ();
}
void
Film::set_ratings (vector<dcp::Rating> r)
{
- FilmChangeSignaller ch (this, Property::RATINGS);
+ FilmChangeSignaller ch(this, FilmProperty::RATINGS);
_ratings = r;
}
void
Film::set_content_versions (vector<string> v)
{
- FilmChangeSignaller ch (this, Property::CONTENT_VERSIONS);
+ FilmChangeSignaller ch(this, FilmProperty::CONTENT_VERSIONS);
_content_versions = v;
}
void
Film::set_name_language (dcp::LanguageTag lang)
{
- FilmChangeSignaller ch (this, Property::NAME_LANGUAGE);
+ FilmChangeSignaller ch(this, FilmProperty::NAME_LANGUAGE);
_name_language = lang;
}
-void
-Film::set_audio_language (dcp::LanguageTag lang)
-{
- FilmChangeSignaller ch (this, Property::AUDIO_LANGUAGE);
- _audio_language = lang;
-}
-
-
void
Film::set_release_territory (optional<dcp::LanguageTag::RegionSubtag> region)
{
- FilmChangeSignaller ch (this, Property::RELEASE_TERRITORY);
+ FilmChangeSignaller ch(this, FilmProperty::RELEASE_TERRITORY);
_release_territory = region;
}
void
Film::set_status (dcp::Status s)
{
- FilmChangeSignaller ch (this, Property::STATUS);
+ FilmChangeSignaller ch(this, FilmProperty::STATUS);
_status = s;
}
void
Film::set_version_number (int v)
{
- FilmChangeSignaller ch (this, Property::VERSION_NUMBER);
+ FilmChangeSignaller ch(this, FilmProperty::VERSION_NUMBER);
_version_number = v;
}
void
Film::set_chain (optional<string> c)
{
- FilmChangeSignaller ch (this, Property::CHAIN);
+ FilmChangeSignaller ch(this, FilmProperty::CHAIN);
_chain = c;
}
void
Film::set_distributor (optional<string> d)
{
- FilmChangeSignaller ch (this, Property::DISTRIBUTOR);
+ FilmChangeSignaller ch(this, FilmProperty::DISTRIBUTOR);
_distributor = d;
}
void
Film::set_luminance (optional<dcp::Luminance> l)
{
- FilmChangeSignaller ch (this, Property::LUMINANCE);
+ FilmChangeSignaller ch(this, FilmProperty::LUMINANCE);
_luminance = l;
}
void
Film::set_facility (optional<string> f)
{
- FilmChangeSignaller ch (this, Property::FACILITY);
+ FilmChangeSignaller ch(this, FilmProperty::FACILITY);
_facility = f;
}
void
Film::set_studio (optional<string> s)
{
- FilmChangeSignaller ch (this, Property::STUDIO);
+ FilmChangeSignaller ch(this, FilmProperty::STUDIO);
_studio = s;
}
return std::make_shared<InfoFileHandle>(_info_file_mutex, info_file(period), read);
}
-InfoFileHandle::InfoFileHandle (boost::mutex& mutex, boost::filesystem::path file, bool read)
+InfoFileHandle::InfoFileHandle (boost::mutex& mutex, boost::filesystem::path path, bool read)
: _lock (mutex)
- , _file (file)
+ , _file(path, read ? "rb" : (dcp::filesystem::exists(path) ? "r+b" : "wb"))
{
- if (read) {
- _handle = fopen_boost (file, "rb");
- if (!_handle) {
- throw OpenFileError (file, errno, OpenFileError::READ);
- }
- } else {
- auto const exists = boost::filesystem::exists (file);
- if (exists) {
- _handle = fopen_boost (file, "r+b");
- } else {
- _handle = fopen_boost (file, "wb");
- }
-
- if (!_handle) {
- throw OpenFileError (file, errno, exists ? OpenFileError::READ_WRITE : OpenFileError::WRITE);
- }
+ if (!_file) {
+ throw OpenFileError(path, errno, read ? OpenFileError::READ : (dcp::filesystem::exists(path) ? OpenFileError::READ_WRITE : OpenFileError::WRITE));
}
}
-InfoFileHandle::~InfoFileHandle ()
-{
- fclose (_handle);
-}
-
/** Add FFOC and LFOC markers to a list if they are not already there */
void
void
Film::set_temp_version (bool t)
{
- FilmChangeSignaller ch (this, Property::TEMP_VERSION);
+ FilmChangeSignaller ch(this, FilmProperty::TEMP_VERSION);
_temp_version = t;
}
void
Film::set_pre_release (bool p)
{
- FilmChangeSignaller ch (this, Property::PRE_RELEASE);
+ FilmChangeSignaller ch(this, FilmProperty::PRE_RELEASE);
_pre_release = p;
}
void
Film::set_red_band (bool r)
{
- FilmChangeSignaller ch (this, Property::RED_BAND);
+ FilmChangeSignaller ch(this, FilmProperty::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);
+ FilmChangeSignaller ch(this, FilmProperty::TWO_D_VERSION_OF_THREE_D);
_two_d_version_of_three_d = t;
}
+
+void
+Film::set_audio_language (optional<dcp::LanguageTag> language)
+{
+ FilmChangeSignaller ch(this, FilmProperty::AUDIO_LANGUAGE);
+ _audio_language = language;
+}
+
+
+void
+Film::set_audio_frame_rate (int rate)
+{
+ FilmChangeSignaller ch(this, FilmProperty::AUDIO_FRAME_RATE);
+ _audio_frame_rate = rate;
+}
+
+
+bool
+Film::has_sign_language_video_channel () const
+{
+ return _audio_channels >= static_cast<int>(dcp::Channel::SIGN_LANGUAGE);
+}
+
+
+void
+Film::set_sign_language_video_language (optional<dcp::LanguageTag> lang)
+{
+ FilmChangeSignaller ch(this, FilmProperty::SIGN_LANGUAGE_VIDEO_LANGUAGE);
+ _sign_language_video_language = lang;
+}
+
+
+void
+Film::set_dirty (bool dirty)
+{
+ auto const changed = dirty != _dirty;
+ _dirty = dirty;
+ if (changed) {
+ emit (boost::bind(boost::ref(DirtyChange), _dirty));
+ }
+}
+
+
+/** @return true if the metadata was (probably) last written by a version earlier
+ * than the given one; false if it definitely was not.
+ */
+bool
+Film::last_written_by_earlier_than(int major, int minor, int micro) const
+{
+ if (!_last_written_by) {
+ return true;
+ }
+
+ vector<string> parts;
+ boost::split(parts, *_last_written_by, boost::is_any_of("."));
+
+ if (parts.size() != 3) {
+ /* Not sure what's going on, so let's say it was written by an old version */
+ return true;
+ }
+
+ if (boost::ends_with(parts[2], "pre")) {
+ parts[2] = parts[2].substr(0, parts[2].length() - 3);
+ }
+
+ int our_major = dcp::raw_convert<int>(parts[0]);
+ int our_minor = dcp::raw_convert<int>(parts[1]);
+ int our_micro = dcp::raw_convert<int>(parts[2]);
+
+ if (our_major != major) {
+ return our_major < major;
+ }
+
+ if (our_minor != minor) {
+ return our_minor < minor;
+ }
+
+ return our_micro < micro;
+}
+
+
+void
+Film::set_territory_type(TerritoryType type)
+{
+ FilmChangeSignaller ch(this, FilmProperty::TERRITORY_TYPE);
+ _territory_type = type;
+}
+
+
+void
+Film::set_ui_state(string key, string value)
+{
+ _ui_state[key] = value;
+ write_ui_state();
+}
+
+
+boost::optional<std::string>
+Film::ui_state(string key) const
+{
+ auto iter = _ui_state.find(key);
+ if (iter == _ui_state.end()) {
+ return {};
+ }
+
+ return iter->second;
+}
+
+
+void
+Film::write_ui_state() const
+{
+ auto doc = make_shared<xmlpp::Document>();
+ auto root = doc->create_root_node("UI");
+
+ for (auto state: _ui_state) {
+ cxml::add_text_child(root, state.first, state.second);
+ }
+
+ try {
+ doc->write_to_file_formatted(dcp::filesystem::fix_long_path(file(ui_state_file)).string());
+ } catch (...) {}
+}
+
+
+void
+Film::read_ui_state()
+{
+ try {
+ cxml::Document xml("UI");
+ xml.read_file(dcp::filesystem::fix_long_path(file(ui_state_file)));
+ for (auto node: xml.node_children()) {
+ if (!node->is_text()) {
+ _ui_state[node->name()] = node->content();
+ }
+ }
+ } catch (...) {}
+}
projects / dcpomatic.git / blobdiff