/*
- Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
/** @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 "screen_kdm.h"
-#include "cinema.h"
-#include "change_signaller.h"
-#include "check_content_change_job.h"
+#include "transcode_job.h"
+#include "upload_job.h"
+#include "util.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/local_time.h>
#include <dcp/raw_convert.h>
-#include <dcp/reel_mxf.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/foreach.hpp>
+#include <boost/filesystem.hpp>
#include <boost/regex.hpp>
#include <unistd.h>
#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 boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+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 boost::optional;
using boost::is_any_of;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
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.
* 36 -> 37
* TextContent can be in a Caption tag, and some of the tag names
* have had Subtitle prefixes or suffixes removed.
+ * 37 -> 38
+ * VideoContent scale expressed just as "guess" or "custom"
*/
-int const Film::current_state_version = 37;
+int const Film::current_state_version = 38;
+
/** Construct a Film object in a given directory.
*
, _use_isdcf_name (true)
, _dcp_content_type (Config::instance()->default_dcp_content_type ())
, _container (Config::instance()->default_container ())
- , _resolution (RESOLUTION_2K)
- , _signed (true)
+ , _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)
- , _upload_after_make_dcp (Config::instance()->default_upload_after_make_dcp())
, _reencode_j2k (false)
, _user_explicit_video_frame_rate (false)
+ , _user_explicit_container (false)
+ , _user_explicit_resolution (false)
+ , _name_language (dcp::LanguageTag("en-US"))
+ , _version_number (1)
+ , _status (dcp::Status::FINAL)
, _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));
boost::filesystem::path p (boost::filesystem::system_complete (dir.get()));
boost::filesystem::path result;
- for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) {
- if (*i == "..") {
+ for (auto i: p) {
+ if (i == "..") {
boost::system::error_code ec;
if (boost::filesystem::is_symlink(result, ec) || result.filename() == "..") {
- result /= *i;
+ result /= i;
} else {
result = result.parent_path ();
}
- } else if (*i != ".") {
- result /= *i;
+ } else if (i != ".") {
+ result /= i;
}
}
}
if (_directory) {
- _log.reset (new FileLog (file ("log")));
+ _log = make_shared<FileLog>(file("log"));
} else {
- _log.reset (new NullLog);
+ _log = make_shared<NullLog>();
}
_playlist->set_sequence (_sequence);
Film::~Film ()
{
- BOOST_FOREACH (boost::signals2::connection& i, _job_connections) {
+ for (auto& i: _job_connections) {
i.disconnect ();
}
- BOOST_FOREACH (boost::signals2::connection& i, _audio_analysis_connections) {
+ for (auto& i: _audio_analysis_connections) {
i.disconnect ();
}
}
s += "_3D";
}
+ if (_reencode_j2k) {
+ s += "_R";
+ }
+
return s;
}
boost::filesystem::path
Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
{
- boost::filesystem::path p = dir ("analysis");
+ auto p = dir ("analysis");
Digester digester;
- BOOST_FOREACH (shared_ptr<Content> 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
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());
}
}
return p;
}
+
+boost::filesystem::path
+Film::subtitle_analysis_path (shared_ptr<const Content> content) const
+{
+ auto p = dir ("analysis");
+
+ Digester digester;
+ digester.add (content->digest());
+
+ if (!content->text.empty()) {
+ auto tc = content->text.front();
+ digester.add (tc->x_scale());
+ digester.add (tc->y_scale());
+ for (auto i: tc->fonts()) {
+ digester.add (i->id());
+ }
+ if (tc->effect()) {
+ digester.add (tc->effect().get());
+ }
+ digester.add (tc->line_spacing());
+ digester.add (tc->outline_width());
+ }
+
+ auto fc = dynamic_pointer_cast<const FFmpegContent>(content);
+ if (fc) {
+ digester.add (fc->subtitle_stream()->identifier());
+ }
+
+ p /= digester.get ();
+ return p;
+}
+
+
/** 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.
throw BadSettingError (_("name"), _("Cannot contain slashes"));
}
- if (container() == 0) {
+ if (container() == nullptr) {
throw MissingSettingError (_("container"));
}
throw runtime_error (_("The DCP is empty, perhaps because all the content has zero length."));
}
- if (dcp_content_type() == 0) {
+ if (dcp_content_type() == nullptr) {
throw MissingSettingError (_("content type"));
}
set_name ("DCP");
}
- BOOST_FOREACH (shared_ptr<const Content> i, content ()) {
+ for (auto i: content ()) {
if (!i->paths_valid()) {
throw runtime_error (_("some of your content is missing"));
}
- shared_ptr<const DCPContent> dcp = dynamic_pointer_cast<const DCPContent> (i);
+ auto dcp = dynamic_pointer_cast<const DCPContent>(i);
if (dcp && dcp->needs_kdm()) {
throw runtime_error (_("Some of your content needs a KDM"));
}
set_isdcf_date_today ();
- BOOST_FOREACH (string i, environment_info ()) {
+ for (auto i: environment_info ()) {
LOG_GENERAL_NC (i);
}
- BOOST_FOREACH (shared_ptr<const Content> i, content ()) {
+ for (auto i: content ()) {
LOG_GENERAL ("Content: %1", i->technical_summary());
}
LOG_GENERAL ("DCP video rate %1 fps", video_frame_rate());
}
LOG_GENERAL ("J2K bandwidth %1", j2k_bandwidth());
- shared_ptr<TranscodeJob> tj (new TranscodeJob (shared_from_this()));
- tj->set_encoder (shared_ptr<Encoder> (new DCPEncoder (shared_from_this(), tj)));
+ auto tj = make_shared<TranscodeJob>(shared_from_this());
+ tj->set_encoder (make_shared<DCPEncoder>(shared_from_this(), tj));
if (check) {
- shared_ptr<CheckContentChangeJob> cc (new CheckContentChangeJob(shared_from_this(), tj, gui));
+ auto cc = make_shared<CheckContentChangeJob>(shared_from_this(), tj, gui);
JobManager::instance()->add (cc);
} else {
JobManager::instance()->add (tj);
void
Film::send_dcp_to_tms ()
{
- shared_ptr<Job> j (new UploadJob (shared_from_this()));
- JobManager::instance()->add (j);
+ JobManager::instance()->add(make_shared<UploadJob>(shared_from_this()));
}
shared_ptr<xmlpp::Document>
Film::metadata (bool with_content_paths) const
{
- shared_ptr<xmlpp::Document> doc (new xmlpp::Document);
- xmlpp::Element* root = doc->create_root_node ("Metadata");
+ 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));
+ 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");
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("Signed")->add_child_text (_signed ? "1" : "0");
root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
root->add_child("Key")->add_child_text (_key.hex ());
root->add_child("ContextID")->add_child_text (_context_id);
}
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("UploadAfterMakeDCP")->add_child_text (_upload_after_make_dcp ? "1" : "0");
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) {
- xmlpp::Element* m = root->add_child("Marker");
+ 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()));
}
- BOOST_FOREACH (dcp::Rating i, _ratings) {
+ for (auto i: _ratings) {
i.as_xml (root->add_child("Rating"));
}
- root->add_child("ContentVersion")->add_child_text(_content_version);
+ for (auto i: _content_versions) {
+ root->add_child("ContentVersion")->add_child_text(i);
+ }
+ root->add_child("NameLanguage")->add_child_text(_name_language.to_string());
+ 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<string>(_version_number));
+ root->add_child("Status")->add_child_text(dcp::status_to_string(_status));
+ 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<string>(_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");
+ if (_audio_language) {
+ root->add_child("AudioLanguage")->add_child_text(_audio_language->to_string());
+ }
_playlist->as_xml (root->add_child ("Playlist"), with_content_paths);
return doc;
void
Film::write_metadata (boost::filesystem::path path) const
{
- shared_ptr<xmlpp::Document> doc = metadata ();
- doc->write_to_file_formatted (path.string());
+ metadata()->write_to_file_formatted(path.string());
}
/** Write state to our `metadata' file */
{
DCPOMATIC_ASSERT (directory());
boost::filesystem::create_directories (directory().get());
- shared_ptr<xmlpp::Document> doc = metadata ();
- doc->write_to_file_formatted (file(metadata_file).string ());
+ metadata()->write_to_file_formatted(file(metadata_file).string());
_dirty = false;
}
{
boost::filesystem::create_directories (path.parent_path());
shared_ptr<xmlpp::Document> doc = metadata (false);
- doc->write_to_file_formatted (path.string ());
+ metadata(false)->write_to_file_formatted(path.string());
}
/** Read state from our metadata file.
throw runtime_error (_("This film was created with a newer version of DCP-o-matic, and it cannot be loaded into this version. Sorry!"));
} else if (_state_version < current_state_version) {
/* This is an older version; save a copy (if we haven't already) */
- boost::filesystem::path const older = path->parent_path() / String::compose("metadata.%1.xml", _state_version);
+ auto const older = path->parent_path() / String::compose("metadata.%1.xml", _state_version);
if (!boost::filesystem::is_regular_file(older)) {
try {
boost::filesystem::copy_file(*path, older);
_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"));
}
{
- optional<string> c = f.optional_string_child ("DCPContentType");
+ auto c = f.optional_string_child("DCPContentType");
if (c) {
_dcp_content_type = DCPContentType::from_isdcf_name (c.get ());
}
}
{
- optional<string> c = f.optional_string_child ("Container");
+ auto c = f.optional_string_child("Container");
if (c) {
_container = Ratio::from_id (c.get ());
}
_resolution = string_to_resolution (f.string_child ("Resolution"));
_j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
_video_frame_rate = f.number_child<int> ("VideoFrameRate");
- _signed = f.optional_bool_child("Signed").get_value_or (true);
_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
}
if (_audio_processor && !Config::instance()->show_experimental_audio_processors()) {
- list<AudioProcessor const *> ap = AudioProcessor::visible();
+ auto ap = AudioProcessor::visible();
if (find(ap.begin(), ap.end(), _audio_processor) == ap.end()) {
Config::instance()->set_show_experimental_audio_processors(true);
}
}
- _reel_type = static_cast<ReelType> (f.optional_number_child<int>("ReelType").get_value_or (static_cast<int>(REELTYPE_SINGLE)));
+ _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);
- _upload_after_make_dcp = f.optional_bool_child("UploadAfterMakeDCP").get_value_or (false);
_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);
- BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("Marker")) {
+ for (auto i: f.node_children("Marker")) {
_markers[dcp::marker_from_string(i->string_attribute("Type"))] = DCPTime(dcp::raw_convert<DCPTime::Type>(i->content()));
}
- BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("Rating")) {
+ for (auto i: f.node_children("Rating")) {
_ratings.push_back (dcp::Rating(i));
}
- _content_version = f.optional_string_child("ContentVersion").get_value_or("");
+ for (auto i: f.node_children("ContentVersion")) {
+ _content_versions.push_back (i->content());
+ }
+
+ auto name_language = f.optional_string_child("NameLanguage");
+ if (name_language) {
+ _name_language = dcp::LanguageTag (*name_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<int>("VersionNumber").get_value_or(0);
+
+ auto status = f.optional_string_child("Status");
+ if (status) {
+ _status = dcp::string_to_status (*status);
+ }
+
+ _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<float>("LuminanceValue");
+ auto unit = f.optional_string_child("LuminanceUnit");
+ 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);
+
+ 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")) {
+ _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);
mapped.push_back (i);
}
} else {
- BOOST_FOREACH (shared_ptr<Content> i, content ()) {
+ for (auto i: content()) {
if (i->audio) {
- list<int> c = i->audio->mapping().mapped_output_channels ();
- copy (c.begin(), c.end(), back_inserter (mapped));
+ auto c = i->audio->mapping().mapped_output_channels();
+ copy (c.begin(), c.end(), back_inserter(mapped));
}
}
return mapped;
}
+
+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();
+ }
+ }
+ }
+ 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
{
string d;
- string raw_name = name ();
+ auto raw_name = name ();
/* Split the raw name up into words */
vector<string> words;
string fixed_name;
/* Add each word to fixed_name */
- for (vector<string>::const_iterator i = words.begin(); i != words.end(); ++i) {
- string w = *i;
+ for (auto i: words) {
+ string w = i;
/* First letter is always capitalised */
w[0] = toupper (w[0]);
/* Count caps in w */
size_t caps = 0;
- for (size_t i = 0; i < w.size(); ++i) {
- if (isupper (w[i])) {
+ for (size_t j = 0; j < w.size(); ++j) {
+ if (isupper (w[j])) {
++caps;
}
}
leave it alone.
*/
if (caps == w.size ()) {
- for (size_t i = 1; i < w.size(); ++i) {
- w[i] = tolower (w[i]);
+ for (size_t j = 1; j < w.size(); ++j) {
+ w[j] = tolower (w[j]);
}
}
- for (size_t i = 0; i < w.size(); ++i) {
- fixed_name += w[i];
+ for (size_t j = 0; j < w.size(); ++j) {
+ fixed_name += w[j];
}
}
if (dcp_content_type()) {
d += "_" + dcp_content_type()->isdcf_name();
- d += "-" + raw_convert<string>(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<string>(_version_number);
+ }
+ d += "-" + version;
}
- ISDCFMetadata 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) {
/* 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::TRAILER) {
- Ratio const * content_ratio = 0;
- BOOST_FOREACH (shared_ptr<Content> i, content ()) {
- if (i->video) {
- /* Here's the first piece of video content */
- if (i->video->scale().ratio ()) {
- content_ratio = i->video->scale().ratio ();
- } else {
- content_ratio = Ratio::from_ratio (i->video->size().ratio ());
- }
- break;
+ if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::ContentKind::TRAILER) {
+ auto cl = content();
+ auto first_video = std::find_if(cl.begin(), cl.end(), [](shared_ptr<Content> c) { return static_cast<bool>(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<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();
- }
}
- 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);
- optional<string> subtitle_language;
- bool burnt_in = true;
- bool ccap = false;
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
- BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
- if (j->type() == TEXT_OPEN_SUBTITLE && j->use()) {
- subtitle_language = j->language ();
- if (!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 (dm.subtitle_language) {
- /* Subtitle language is overridden in ISDCF metadata, primarily to handle
- content with pre-burnt subtitles.
- */
- d += "-" + *dm.subtitle_language;
- if (ccap) {
- d += "-CCAP";
- }
- } else if (subtitle_language) {
- /* Language is worked out from the content */
- if (burnt_in && *subtitle_language != "XX") {
- transform (subtitle_language->begin(), subtitle_language->end(), subtitle_language->begin(), ::tolower);
- } else {
- transform (subtitle_language->begin(), subtitle_language->end(), subtitle_language->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 += "-" + *subtitle_language;
- 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;
}
}
/* Count mapped audio channels */
- list<int> mapped = mapped_audio_channels ();
+ auto mapped = mapped_audio_channels ();
- pair<int, int> ch = audio_channel_types (mapped, audio_channels());
+ auto ch = audio_channel_types (mapped, audio_channels());
if (!ch.first && !ch.second) {
d += "_MOS";
} else if (ch.first) {
d += String::compose("_%1%2", ch.first, ch.second);
}
- if (audio_channels() > static_cast<int>(dcp::HI) && find(mapped.begin(), mapped.end(), dcp::HI) != mapped.end()) {
+ if (audio_channels() > static_cast<int>(dcp::Channel::HI) && find(mapped.begin(), mapped.end(), static_cast<int>(dcp::Channel::HI)) != mapped.end()) {
d += "-HI";
}
- if (audio_channels() > static_cast<int>(dcp::VI) && find(mapped.begin(), mapped.end(), dcp::VI) != mapped.end()) {
+ if (audio_channels() > static_cast<int>(dcp::Channel::VI) && find(mapped.begin(), mapped.end(), static_cast<int>(dcp::Channel::VI)) != mapped.end()) {
d += "-VI";
}
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) {
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) {
d += "-3D";
}
- bool vf = false;
- BOOST_FOREACH (shared_ptr<Content> i, content ()) {
- shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (i);
+ auto vf = false;
+ for (auto i: content()) {
+ auto dc = dynamic_pointer_cast<const DCPContent>(i);
if (!dc) {
continue;
}
bool any_text = false;
- for (int i = 0; i < TEXT_COUNT; ++i) {
+ for (int i = 0; i < static_cast<int>(TextType::COUNT); ++i) {
if (dc->reference_text(static_cast<TextType>(i))) {
any_text = true;
}
void
Film::set_name (string n)
{
- ChangeSignaller<Film> ch (this, NAME);
+ FilmChangeSignaller ch (this, Property::NAME);
_name = n;
}
void
Film::set_use_isdcf_name (bool u)
{
- ChangeSignaller<Film> 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<Film> ch (this, DCP_CONTENT_TYPE);
+ FilmChangeSignaller ch (this, Property::DCP_CONTENT_TYPE);
_dcp_content_type = t;
}
+
+/** @param explicit_user true if this is being set because of
+ * a direct user request, false if it is being done because
+ * DCP-o-matic is guessing the best container to use.
+ */
void
-Film::set_container (Ratio const * c)
+Film::set_container (Ratio const * c, bool explicit_user)
{
- ChangeSignaller<Film> ch (this, CONTAINER);
+ FilmChangeSignaller ch (this, Property::CONTAINER);
_container = c;
+
+ if (explicit_user) {
+ _user_explicit_container = true;
+ }
}
+
+/** @param explicit_user true if this is being set because of
+ * a direct user request, false if it is being done because
+ * DCP-o-matic is guessing the best resolution to use.
+ */
void
-Film::set_resolution (Resolution r)
+Film::set_resolution (Resolution r, bool explicit_user)
{
- ChangeSignaller<Film> ch (this, RESOLUTION);
+ FilmChangeSignaller ch (this, Property::RESOLUTION);
_resolution = r;
+
+ if (explicit_user) {
+ _user_explicit_resolution = true;
+ }
}
+
void
Film::set_j2k_bandwidth (int b)
{
- ChangeSignaller<Film> ch (this, J2K_BANDWIDTH);
+ FilmChangeSignaller ch (this, Property::J2K_BANDWIDTH);
_j2k_bandwidth = b;
}
-void
-Film::set_isdcf_metadata (ISDCFMetadata m)
-{
- ChangeSignaller<Film> 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.
void
Film::set_video_frame_rate (int f, bool user_explicit)
{
- ChangeSignaller<Film> 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;
void
Film::set_audio_channels (int c)
{
- ChangeSignaller<Film> ch (this, AUDIO_CHANNELS);
+ FilmChangeSignaller ch (this, Property::AUDIO_CHANNELS);
_audio_channels = c;
}
void
Film::set_three_d (bool t)
{
- ChangeSignaller<Film> 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<Film> 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<Film> ch (this, INTEROP);
+ FilmChangeSignaller ch (this, Property::INTEROP);
_interop = i;
}
void
Film::set_audio_processor (AudioProcessor const * processor)
{
- ChangeSignaller<Film> ch1 (this, AUDIO_PROCESSOR);
- ChangeSignaller<Film> 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<Film> ch (this, REEL_TYPE);
+ FilmChangeSignaller ch (this, Property::REEL_TYPE);
_reel_type = t;
}
void
Film::set_reel_length (int64_t r)
{
- ChangeSignaller<Film> ch (this, REEL_LENGTH);
+ FilmChangeSignaller ch (this, Property::REEL_LENGTH);
_reel_length = r;
}
-void
-Film::set_upload_after_make_dcp (bool u)
-{
- ChangeSignaller<Film> ch (this, UPLOAD_AFTER_MAKE_DCP);
- _upload_after_make_dcp = u;
-}
-
void
Film::set_reencode_j2k (bool r)
{
- ChangeSignaller<Film> ch (this, REENCODE_J2K);
+ FilmChangeSignaller ch (this, Property::REENCODE_J2K);
_reencode_j2k = r;
}
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());
}
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).
*/
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";
}
vector<CPLSummary> out;
- boost::filesystem::path const dir = directory().get();
- for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) {
+ auto const dir = directory().get();
+ for (auto i: boost::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"
+ boost::filesystem::is_directory (i) &&
+ i.path().leaf() != "j2c" && i.path().leaf() != "video" && i.path().leaf() != "info" && i.path().leaf() != "analysis"
) {
try {
- out.push_back (CPLSummary(*i));
+ out.push_back (CPLSummary(i));
} catch (...) {
}
return out;
}
-void
-Film::set_signed (bool s)
-{
- ChangeSignaller<Film> ch (this, SIGNED);
- _signed = s;
-}
-
void
Film::set_encrypted (bool e)
{
- ChangeSignaller<Film> ch (this, ENCRYPTED);
+ FilmChangeSignaller ch (this, Property::ENCRYPTED);
_encrypted = e;
}
-void
-Film::set_key (dcp::Key key)
-{
- ChangeSignaller<Film> ch (this, KEY);
- _key = key;
-}
-
ContentList
Film::content () const
{
run_ffprobe (content->path(0), file("ffprobe.log"));
}
- shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), content));
+ auto j = make_shared<ExamineContentJob>(shared_from_this(), content);
_job_connections.push_back (
j->Finished.connect (bind (&Film::maybe_add_content, this, weak_ptr<Job>(j), weak_ptr<Content>(content), disable_audio_analysis))
void
Film::maybe_add_content (weak_ptr<Job> j, weak_ptr<Content> c, bool disable_audio_analysis)
{
- shared_ptr<Job> job = j.lock ();
+ auto job = j.lock ();
if (!job || !job->finished_ok ()) {
return;
}
- shared_ptr<Content> content = c.lock ();
+ auto content = c.lock ();
if (!content) {
return;
}
add_content (content);
if (Config::instance()->automatic_audio_analysis() && content->audio && !disable_audio_analysis) {
- shared_ptr<Playlist> playlist (new Playlist);
+ auto playlist = make_shared<Playlist>();
playlist->add (shared_from_this(), content);
boost::signals2::connection c;
JobManager::instance()->analyse_audio (
if (_template_film) {
/* Take settings from the first piece of content of c's type in _template */
- BOOST_FOREACH (shared_ptr<Content> i, _template_film->content()) {
+ for (auto i: _template_film->content()) {
c->take_settings_from (i);
}
}
_playlist->add (shared_from_this(), c);
+
+ maybe_set_container_and_resolution ();
+ if (c->atmos) {
+ set_audio_channels (14);
+ set_interop (false);
+ }
+}
+
+
+void
+Film::maybe_set_container_and_resolution ()
+{
+ /* Get the only piece of video content, if there is only one */
+ shared_ptr<VideoContent> video;
+ for (auto i: _playlist->content()) {
+ if (i->video) {
+ if (!video) {
+ video = i->video;
+ } else {
+ video.reset ();
+ }
+ }
+ }
+
+ if (video) {
+ /* 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) {
+ 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) {
+ set_resolution (Resolution::FOUR_K, false);
+ } else {
+ set_resolution (Resolution::TWO_K, false);
+ }
+ }
+ }
}
void
Film::remove_content (shared_ptr<Content> c)
{
_playlist->remove (c);
+ maybe_set_container_and_resolution ();
}
void
Film::best_video_frame_rate () const
{
/* Don't default to anything above 30fps (make the user select that explicitly) */
- int best = _playlist->best_video_frame_rate ();
+ auto best = _playlist->best_video_frame_rate ();
if (best > 30) {
best /= 2;
}
Film::playlist_content_change (ChangeType type, weak_ptr<Content> 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 ();
} else {
ContentChange (type, c, p, frequent);
}
+
+ _dirty = true;
}
void
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 ();
}
+
+ _dirty = true;
}
/** Check for (and if necessary fix) impossible settings combinations, like
void
Film::check_settings_consistency ()
{
+ optional<int> atmos_rate;
+ for (auto i: content()) {
+
+ if (i->atmos) {
+ int rate = lrintf (i->atmos->edit_rate().as_float());
+ if (atmos_rate && *atmos_rate != rate) {
+ Message (_("You have more than one piece of Atmos content, and they do not have the same frame rate. You must remove some Atmos content."));
+ } else if (!atmos_rate && rate != video_frame_rate()) {
+ atmos_rate = rate;
+ set_video_frame_rate (rate, false);
+ Message (_("DCP-o-matic had to change your settings so that the film's frame rate is the same as that of your Atmos content."));
+ }
+ }
+ }
+
bool change_made = false;
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
- shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+ for (auto i: content()) {
+ auto d = dynamic_pointer_cast<DCPContent>(i);
if (!d) {
continue;
}
d->set_reference_audio(false);
change_made = true;
}
+ 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(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;
+ }
}
if (change_made) {
Film::playlist_order_changed ()
{
/* XXX: missing PENDING */
- signal_change (CHANGE_TYPE_DONE, CONTENT_ORDER);
+ signal_change (ChangeType::DONE, Property::CONTENT_ORDER);
}
int
return;
}
- ChangeSignaller<Film> cc (this, SEQUENCE);
+ FilmChangeSignaller cc (this, Property::SEQUENCE);
_sequence = s;
_playlist->set_sequence (s);
}
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);
}
return fit_ratio_within (container()->ratio(), full_frame ());
}
+
+/** @return Area of Film::frame_size() that contains picture rather than pillar/letterboxing */
+dcp::Size
+Film::active_area () const
+{
+ auto const frame = frame_size ();
+ dcp::Size active;
+
+ 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);
+ }
+ }
+
+ return active;
+}
+
+
/** @param recipient KDM recipient certificate.
* @param trusted_devices Certificate thumbprints of other trusted devices (can be empty).
* @param cpl_file CPL filename.
throw runtime_error (_("Cannot make a KDM as this project is not encrypted."));
}
- shared_ptr<const dcp::CPL> cpl (new dcp::CPL (cpl_file));
- shared_ptr<const dcp::CertificateChain> signer = Config::instance()->signer_chain ();
+ 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;
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
- shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent> (i);
+ for (auto i: content()) {
+ auto d = dynamic_pointer_cast<DCPContent> (i);
if (d && d->kdm()) {
dcp::DecryptedKDM kdm (d->kdm().get(), Config::instance()->decryption_chain()->key().get());
- list<dcp::DecryptedKDMKey> keys = kdm.keys ();
+ auto keys = kdm.keys ();
copy (keys.begin(), keys.end(), back_inserter (imported_keys));
}
}
- map<shared_ptr<const dcp::ReelMXF>, dcp::Key> keys;
+ map<shared_ptr<const dcp::ReelFileAsset>, dcp::Key> keys;
- BOOST_FOREACH(shared_ptr<const dcp::ReelMXF> i, cpl->reel_mxfs()) {
- if (!i->key_id()) {
+ for (auto i: cpl->reel_file_assets()) {
+ if (!i->encrypted()) {
continue;
}
/* Get any imported key for this ID */
bool done = false;
- BOOST_FOREACH (dcp::DecryptedKDMKey j, imported_keys) {
+ 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();
).encrypt (signer, recipient, trusted_devices, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
}
-/** @param screens Screens to make KDMs for.
- * @param cpl_file Path to CPL to make KDMs for.
- * @param from KDM from time expressed as a local time in the time zone of the Screen's Cinema.
- * @param until KDM to time expressed as a local time in the time zone of the Screen's Cinema.
- * @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.
- */
-list<shared_ptr<ScreenKDM> >
-Film::make_kdms (
- list<shared_ptr<Screen> > screens,
- boost::filesystem::path cpl_file,
- boost::posix_time::ptime from,
- boost::posix_time::ptime until,
- dcp::Formulation formulation,
- bool disable_forensic_marking_picture,
- optional<int> disable_forensic_marking_audio
- ) const
-{
- list<shared_ptr<ScreenKDM> > kdms;
-
- BOOST_FOREACH (shared_ptr<Screen> i, screens) {
- if (i->recipient) {
- dcp::EncryptedKDM const kdm = make_kdm (
- i->recipient.get(),
- i->trusted_device_thumbprints(),
- cpl_file,
- dcp::LocalTime (from, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
- dcp::LocalTime (until, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
- formulation,
- disable_forensic_marking_picture,
- disable_forensic_marking_audio
- );
-
- kdms.push_back (shared_ptr<ScreenKDM>(new DCPScreenKDM(i, kdm)));
- }
- }
-
- return kdms;
-}
/** @return The approximate disk space required to encode a DCP of this film with the
* current settings, in bytes.
boost::filesystem::path test = internal_video_asset_dir() / "test";
boost::filesystem::path test2 = internal_video_asset_dir() / "test2";
can_hard_link = true;
- FILE* f = fopen_boost (test, "w");
+ auto f = fopen_boost (test, "w");
if (f) {
fclose (f);
boost::system::error_code ec;
boost::filesystem::remove (test2);
}
- boost::filesystem::space_info s = boost::filesystem::space (internal_video_asset_dir ());
+ auto s = boost::filesystem::space (internal_video_asset_dir ());
required = double (required_disk_space ()) / 1073741824.0f;
if (!can_hard_link) {
required *= 2;
return (available - required) > 1;
}
-string
-Film::subtitle_language () const
-{
- set<string> languages;
-
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
- BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
- languages.insert (j->language ());
- }
- }
-
- string all;
- BOOST_FOREACH (string s, languages) {
- if (!all.empty ()) {
- all += "/" + s;
- } else {
- all += s;
- }
- }
-
- return all;
-}
-
/** @return The names of the channels that audio contents' outputs are passed into;
* this is either the DCP or a AudioProcessor.
*/
-vector<string>
+vector<NamedChannel>
Film::audio_output_names () const
{
if (audio_processor ()) {
DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16);
- vector<string> n;
+ vector<NamedChannel> n;
for (int i = 0; i < audio_channels(); ++i) {
- n.push_back (short_audio_channel_name (i));
+ if (i != 8 && i != 9 && i != 15) {
+ n.push_back (NamedChannel(short_audio_channel_name(i), i));
+ }
}
return n;
Film::reels () const
{
list<DCPTimePeriod> p;
- DCPTime const len = length();
+ 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<DCPTime> split_points;
split_points.push_back (DCPTime());
split_points.push_back (len);
- BOOST_FOREACH (shared_ptr<Content> c, content()) {
+ for (auto c: content()) {
if (c->video) {
- BOOST_FOREACH (DCPTime t, c->reel_split_points(shared_from_this())) {
+ for (auto t: c->reel_split_points(shared_from_this())) {
split_points.push_back (t);
}
split_points.push_back (c->end(shared_from_this()));
/* Make them into periods, coalescing any that are less than 1 second long */
optional<DCPTime> last;
- BOOST_FOREACH (DCPTime t, split_points) {
+ 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));
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,
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;
_resolution = _template_film->_resolution;
_j2k_bandwidth = _template_film->_j2k_bandwidth;
_video_frame_rate = _template_film->_video_frame_rate;
- _signed = _template_film->_signed;
_encrypted = _template_film->_encrypted;
_audio_channels = _template_film->_audio_channels;
_sequence = _template_film->_sequence;
_audio_processor = _template_film->_audio_processor;
_reel_type = _template_film->_reel_type;
_reel_length = _template_film->_reel_length;
- _upload_after_make_dcp = _template_film->_upload_after_make_dcp;
- _isdcf_metadata = _template_film->_isdcf_metadata;
}
pair<double, double>
bool
Film::references_dcp_video () const
{
- BOOST_FOREACH (shared_ptr<Content> i, _playlist->content()) {
- shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+ for (auto i: _playlist->content()) {
+ auto d = dynamic_pointer_cast<DCPContent>(i);
if (d && d->reference_video()) {
return true;
}
bool
Film::references_dcp_audio () const
{
- BOOST_FOREACH (shared_ptr<Content> i, _playlist->content()) {
- shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+ for (auto i: _playlist->content()) {
+ auto d = dynamic_pointer_cast<DCPContent>(i);
if (d && d->reference_audio()) {
return true;
}
return false;
}
+
+bool
+Film::contains_atmos_content () const
+{
+ for (auto i: _playlist->content()) {
+ if (i->atmos) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+
list<DCPTextTrack>
Film::closed_caption_tracks () const
{
list<DCPTextTrack> tt;
- BOOST_FOREACH (shared_ptr<Content> i, content()) {
- BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+ for (auto i: content()) {
+ for (auto j: i->text) {
/* XXX: Empty DCPTextTrack ends up being a magic value here - the "unknown" or "not specified" track */
- DCPTextTrack dtt = j->dcp_track().get_value_or(DCPTextTrack());
- if (j->type() == TEXT_CLOSED_CAPTION && find(tt.begin(), tt.end(), dtt) == tt.end()) {
+ auto dtt = j->dcp_track().get_value_or(DCPTextTrack());
+ if (j->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)
{
- ChangeSignaller<Film> ch (this, MARKERS);
+ FilmChangeSignaller ch (this, Property::MARKERS);
_markers[type] = time;
}
+
void
Film::unset_marker (dcp::Marker type)
{
- ChangeSignaller<Film> ch (this, MARKERS);
+ FilmChangeSignaller ch (this, Property::MARKERS);
_markers.erase (type);
}
void
Film::clear_markers ()
{
- ChangeSignaller<Film> ch (this, MARKERS);
+ FilmChangeSignaller ch (this, Property::MARKERS);
_markers.clear ();
}
void
Film::set_ratings (vector<dcp::Rating> r)
{
- ChangeSignaller<Film> ch (this, RATINGS);
+ FilmChangeSignaller ch (this, Property::RATINGS);
_ratings = r;
}
void
-Film::set_content_version (string v)
+Film::set_content_versions (vector<string> v)
+{
+ FilmChangeSignaller ch (this, Property::CONTENT_VERSIONS);
+ _content_versions = v;
+}
+
+
+void
+Film::set_name_language (dcp::LanguageTag lang)
+{
+ FilmChangeSignaller ch (this, Property::NAME_LANGUAGE);
+ _name_language = lang;
+}
+
+
+void
+Film::set_release_territory (optional<dcp::LanguageTag::RegionSubtag> region)
+{
+ FilmChangeSignaller ch (this, Property::RELEASE_TERRITORY);
+ _release_territory = region;
+}
+
+
+void
+Film::set_status (dcp::Status s)
+{
+ FilmChangeSignaller ch (this, Property::STATUS);
+ _status = s;
+}
+
+
+void
+Film::set_version_number (int v)
+{
+ FilmChangeSignaller ch (this, Property::VERSION_NUMBER);
+ _version_number = v;
+}
+
+
+void
+Film::set_chain (optional<string> c)
+{
+ FilmChangeSignaller ch (this, Property::CHAIN);
+ _chain = c;
+}
+
+
+void
+Film::set_distributor (optional<string> d)
+{
+ FilmChangeSignaller ch (this, Property::DISTRIBUTOR);
+ _distributor = d;
+}
+
+
+void
+Film::set_luminance (optional<dcp::Luminance> l)
+{
+ FilmChangeSignaller ch (this, Property::LUMINANCE);
+ _luminance = l;
+}
+
+
+void
+Film::set_facility (optional<string> f)
{
- ChangeSignaller<Film> ch (this, CONTENT_VERSION);
- _content_version = v;
+ FilmChangeSignaller ch (this, Property::FACILITY);
+ _facility = f;
}
+
+void
+Film::set_studio (optional<string> s)
+{
+ FilmChangeSignaller ch (this, Property::STUDIO);
+ _studio = s;
+}
+
+
optional<DCPTime>
Film::marker (dcp::Marker type) const
{
- map<dcp::Marker, DCPTime>::const_iterator i = _markers.find (type);
+ auto i = _markers.find (type);
if (i == _markers.end()) {
- return optional<DCPTime>();
+ return {};
}
return i->second;
}
shared_ptr<InfoFileHandle>
Film::info_file_handle (DCPTimePeriod period, bool read) const
{
- return shared_ptr<InfoFileHandle> (new InfoFileHandle(_info_file_mutex, info_file(period), read));
+ return std::make_shared<InfoFileHandle>(_info_file_mutex, info_file(period), read);
}
InfoFileHandle::InfoFileHandle (boost::mutex& mutex, boost::filesystem::path file, bool read)
throw OpenFileError (file, errno, OpenFileError::READ);
}
} else {
- bool const exists = boost::filesystem::exists (file);
+ auto const exists = boost::filesystem::exists (file);
if (exists) {
_handle = fopen_boost (file, "r+b");
} else {
{
fclose (_handle);
}
+
+
+/** Add FFOC and LFOC markers to a list if they are not already there */
+void
+Film::add_ffoc_lfoc (Markers& markers) const
+{
+ if (markers.find(dcp::Marker::FFOC) == markers.end()) {
+ markers[dcp::Marker::FFOC] = dcpomatic::DCPTime::from_frames(1, video_frame_rate());
+ }
+
+ if (markers.find(dcp::Marker::LFOC) == markers.end()) {
+ 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<dcp::LanguageTag> language)
+{
+ FilmChangeSignaller ch (this, Property::AUDIO_LANGUAGE);
+ _audio_language = language;
+}
+
+
+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, Property::SIGN_LANGUAGE_VIDEO_LANGUAGE);
+ _sign_language_video_language = lang;
+}
+
projects / dcpomatic.git / blobdiff