/*
- Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2023 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#include "atmos_content.h"
-#include "dcp_content.h"
-#include "video_content.h"
#include "audio_content.h"
-#include "dcp_examiner.h"
-#include "job.h"
-#include "film.h"
-#include "config.h"
-#include "overlaps.h"
#include "compose.hpp"
+#include "config.h"
+#include "dcp_content.h"
#include "dcp_decoder.h"
-#include "log.h"
+#include "dcp_examiner.h"
#include "dcpomatic_log.h"
+#include "film.h"
+#include "job.h"
+#include "log.h"
+#include "overlaps.h"
#include "text_content.h"
+#include "video_content.h"
#include <dcp/dcp.h>
#include <dcp/raw_convert.h>
#include <dcp/exceptions.h>
#include <dcp/reel_picture_asset.h>
#include <dcp/reel_subtitle_asset.h>
#include <dcp/reel.h>
+#include <dcp/scope_guard.h>
#include <libxml++/libxml++.h>
#include <iterator>
#include <iostream>
#include "i18n.h"
-using std::string;
+
using std::cout;
-using std::distance;
-using std::pair;
-using std::vector;
+using std::dynamic_pointer_cast;
+using std::exception;
+using std::function;
using std::list;
-using std::map;
+using std::make_shared;
using std::shared_ptr;
-using boost::scoped_ptr;
+using std::string;
+using std::vector;
using boost::optional;
-using boost::function;
-using std::dynamic_pointer_cast;
+using boost::scoped_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
using dcp::raw_convert;
using namespace dcpomatic;
+
int const DCPContentProperty::NEEDS_ASSETS = 600;
int const DCPContentProperty::NEEDS_KDM = 601;
int const DCPContentProperty::REFERENCE_VIDEO = 602;
int const DCPContentProperty::TEXTS = 606;
int const DCPContentProperty::CPL = 607;
+
DCPContent::DCPContent (boost::filesystem::path p)
: _encrypted (false)
, _needs_assets (false)
read_directory (p);
set_default_colour_conversion ();
-
- for (int i = 0; i < TEXT_COUNT; ++i) {
- _reference_text[i] = false;
- }
}
DCPContent::DCPContent (cxml::ConstNodePtr node, int version)
: Content (node)
{
- video = VideoContent::from_xml (this, node, version);
+ video = VideoContent::from_xml (this, node, version, VideoRange::FULL);
audio = AudioContent::from_xml (this, node, version);
- text = TextContent::from_xml (this, node, version);
+ list<string> notes;
+ text = TextContent::from_xml (this, node, version, notes);
atmos = AtmosContent::from_xml (this, node);
- for (int i = 0; i < TEXT_COUNT; ++i) {
- _reference_text[i] = false;
- }
-
if (video && audio) {
audio->set_stream (
- AudioStreamPtr (
- new AudioStream (
- node->number_child<int> ("AudioFrameRate"),
- /* AudioLength was not present in some old metadata versions */
- node->optional_number_child<Frame>("AudioLength").get_value_or (
- video->length() * node->number_child<int>("AudioFrameRate") / video_frame_rate().get()
- ),
- AudioMapping (node->node_child ("AudioMapping"), version)
- )
+ make_shared<AudioStream> (
+ node->number_child<int> ("AudioFrameRate"),
+ /* AudioLength was not present in some old metadata versions */
+ node->optional_number_child<Frame>("AudioLength").get_value_or (
+ video->length() * node->number_child<int>("AudioFrameRate") / video_frame_rate().get()
+ ),
+ AudioMapping(node->node_child("AudioMapping"), version),
+ 24
)
);
}
_reference_video = node->optional_bool_child ("ReferenceVideo").get_value_or (false);
_reference_audio = node->optional_bool_child ("ReferenceAudio").get_value_or (false);
if (version >= 37) {
- _reference_text[TEXT_OPEN_SUBTITLE] = node->optional_bool_child("ReferenceOpenSubtitle").get_value_or(false);
- _reference_text[TEXT_CLOSED_CAPTION] = node->optional_bool_child("ReferenceClosedCaption").get_value_or(false);
+ _reference_text[TextType::OPEN_SUBTITLE] = node->optional_bool_child("ReferenceOpenSubtitle").get_value_or(false);
+ _reference_text[TextType::CLOSED_CAPTION] = node->optional_bool_child("ReferenceClosedCaption").get_value_or(false);
} else {
- _reference_text[TEXT_OPEN_SUBTITLE] = node->optional_bool_child("ReferenceSubtitle").get_value_or(false);
- _reference_text[TEXT_CLOSED_CAPTION] = false;
+ _reference_text[TextType::OPEN_SUBTITLE] = node->optional_bool_child("ReferenceSubtitle").get_value_or(false);
+ _reference_text[TextType::CLOSED_CAPTION] = false;
}
if (node->optional_string_child("Standard")) {
- string const s = node->optional_string_child("Standard").get();
+ auto const s = node->optional_string_child("Standard").get();
if (s == "Interop") {
- _standard = dcp::INTEROP;
+ _standard = dcp::Standard::INTEROP;
} else if (s == "SMPTE") {
- _standard = dcp::SMPTE;
+ _standard = dcp::Standard::SMPTE;
} else {
DCPOMATIC_ASSERT (false);
}
}
_three_d = node->optional_bool_child("ThreeD").get_value_or (false);
- optional<string> ck = node->optional_string_child("ContentKind");
+ auto ck = node->optional_string_child("ContentKind");
if (ck) {
- _content_kind = dcp::content_kind_from_string (*ck);
+ _content_kind = dcp::ContentKind::from_name(*ck);
}
_cpl = node->optional_string_child("CPL");
for (auto i: node->node_children("ReelLength")) {
for (auto i: node->node_children("ContentVersion")) {
_content_versions.push_back (i->content());
}
+
+ _active_audio_channels = node->optional_number_child<int>("ActiveAudioChannels");
}
void
bool have_assetmap = false;
bool have_metadata = false;
- for (directory_iterator i(p); i != directory_iterator(); ++i) {
- if (i->path().filename() == "ASSETMAP" || i->path().filename() == "ASSETMAP.xml") {
+ for (auto i: directory_iterator(p)) {
+ if (i.path().filename() == "ASSETMAP" || i.path().filename() == "ASSETMAP.xml") {
have_assetmap = true;
- } else if (i->path().filename() == "metadata.xml") {
+ } else if (i.path().filename() == "metadata.xml") {
have_metadata = true;
}
}
if (!have_metadata) {
throw DCPError ("No ASSETMAP or ASSETMAP.xml file found: is this a DCP?");
} else {
- throw DCPError (
- "This looks like a DCP-o-matic project folder, which cannot be added to a different project. "
- "Choose the DCP directory inside the DCP-o-matic project folder if that's what you want to import."
- );
+ throw ProjectFolderError ();
}
}
void
DCPContent::read_sub_directory (boost::filesystem::path p)
{
+ using namespace boost::filesystem;
+
LOG_GENERAL ("DCPContent::read_sub_directory reads %1", p.string());
- for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
- if (boost::filesystem::is_regular_file (i->path())) {
- LOG_GENERAL ("Inside there's regular file %1", i->path().string());
- add_path (i->path());
- } else if (boost::filesystem::is_directory (i->path ())) {
- LOG_GENERAL ("Inside there's directory %1", i->path().string());
- read_sub_directory (i->path());
+ try {
+ for (auto i: directory_iterator(p)) {
+ if (is_regular_file(i.path())) {
+ LOG_GENERAL ("Inside there's regular file %1", i.path().string());
+ add_path (i.path());
+ } else if (is_directory(i.path()) && i.path().filename() != ".AppleDouble") {
+ LOG_GENERAL ("Inside there's directory %1", i.path().string());
+ read_sub_directory (i.path());
+ } else {
+ LOG_GENERAL("Ignoring %1 from inside: status is %2", i.path().string(), static_cast<int>(status(i.path()).type()));
+ }
}
+ } catch (exception& e) {
+ LOG_GENERAL("Failed to iterate over %1: %2", p.string(), e.what());
}
}
bool const needed_kdm = needs_kdm ();
string const old_name = name ();
- ChangeSignaller<Content> cc_texts (this, DCPContentProperty::TEXTS);
- ChangeSignaller<Content> cc_assets (this, DCPContentProperty::NEEDS_ASSETS);
- ChangeSignaller<Content> cc_kdm (this, DCPContentProperty::NEEDS_KDM);
- ChangeSignaller<Content> cc_name (this, DCPContentProperty::NAME);
+ ContentChangeSignalDespatcher::instance()->suspend();
+ dcp::ScopeGuard sg = []() {
+ ContentChangeSignalDespatcher::instance()->resume();
+ };
+
+ ContentChangeSignaller cc_texts (this, DCPContentProperty::TEXTS);
+ ContentChangeSignaller cc_assets (this, DCPContentProperty::NEEDS_ASSETS);
+ ContentChangeSignaller cc_kdm (this, DCPContentProperty::NEEDS_KDM);
+ ContentChangeSignaller cc_name (this, DCPContentProperty::NAME);
if (job) {
job->set_progress_unknown ();
}
Content::examine (film, job);
- shared_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film ? film->tolerant() : true));
+ auto examiner = make_shared<DCPExaminer>(shared_from_this(), film ? film->tolerant() : true);
if (examiner->has_video()) {
{
boost::mutex::scoped_lock lm (_mutex);
- video.reset (new VideoContent (this));
+ video = make_shared<VideoContent>(this);
}
- video->take_from_examiner (examiner);
+ video->take_from_examiner(film, examiner);
set_default_colour_conversion ();
}
if (examiner->has_audio()) {
{
boost::mutex::scoped_lock lm (_mutex);
- audio.reset (new AudioContent (this));
+ audio = make_shared<AudioContent>(this);
}
- AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels()));
+ auto as = make_shared<AudioStream>(examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels(), 24);
audio->set_stream (as);
- AudioMapping m = as->mapping ();
+ auto m = as->mapping ();
m.make_default (film ? film->audio_processor() : 0);
as->set_mapping (m);
+
+ _active_audio_channels = examiner->active_audio_channels();
}
if (examiner->has_atmos()) {
{
boost::mutex::scoped_lock lm (_mutex);
- atmos.reset (new AtmosContent(this));
+ atmos = make_shared<AtmosContent>(this);
}
/* Setting length will cause calculations to be made based on edit rate, so that must
* be set up first otherwise hard-to-spot exceptions will be thrown.
atmos->set_length (examiner->atmos_length());
}
- list<shared_ptr<TextContent> > new_text;
- for (int i = 0; i < TEXT_COUNT; ++i) {
- for (int j = 0; j < examiner->text_count(static_cast<TextType>(i)); ++j) {
- shared_ptr<TextContent> c(new TextContent(this, static_cast<TextType>(i), static_cast<TextType>(i)));
- if (i == TEXT_CLOSED_CAPTION) {
- c->set_dcp_track (examiner->dcp_text_track(j));
- }
- new_text.push_back (c);
- }
+ vector<shared_ptr<TextContent>> new_text;
+
+ for (int i = 0; i < examiner->text_count(TextType::OPEN_SUBTITLE); ++i) {
+ auto c = make_shared<TextContent>(this, TextType::OPEN_SUBTITLE, TextType::OPEN_SUBTITLE);
+ c->set_language (examiner->open_subtitle_language());
+ examiner->add_fonts(c);
+ new_text.push_back (c);
+ }
+
+ for (int i = 0; i < examiner->text_count(TextType::CLOSED_CAPTION); ++i) {
+ auto c = make_shared<TextContent>(this, TextType::CLOSED_CAPTION, TextType::CLOSED_CAPTION);
+ c->set_dcp_track (examiner->dcp_text_track(i));
+ examiner->add_fonts(c);
+ new_text.push_back (c);
}
{
_content_kind = examiner->content_kind ();
_cpl = examiner->cpl ();
_reel_lengths = examiner->reel_lengths ();
- map<dcp::Marker, dcp::Time> markers = examiner->markers();
- for (map<dcp::Marker, dcp::Time>::const_iterator i = markers.begin(); i != markers.end(); ++i) {
- _markers[i->first] = ContentTime(i->second.as_editable_units(DCPTime::HZ));
+ for (auto const& i: examiner->markers()) {
+ _markers[i.first] = ContentTime(i.second.as_editable_units_ceil(DCPTime::HZ));
}
_ratings = examiner->ratings ();
_content_versions = examiner->content_versions ();
}
if (video) {
- video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D);
+ video->set_frame_type (_three_d ? VideoFrameType::THREE_D : VideoFrameType::TWO_D);
}
}
return s;
}
+
void
-DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const
+DCPContent::as_xml(xmlpp::Element* element, bool with_paths) const
{
- node->add_child("Type")->add_child_text ("DCP");
+ cxml::add_text_child(element, "Type", "DCP");
- Content::as_xml (node, with_paths);
+ Content::as_xml(element, with_paths);
if (video) {
- video->as_xml (node);
+ video->as_xml(element);
}
if (audio) {
- audio->as_xml (node);
- node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio->stream()->frame_rate()));
- node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio->stream()->length()));
- audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
+ audio->as_xml(element);
+ cxml::add_text_child(element, "AudioFrameRate", raw_convert<string>(audio->stream()->frame_rate()));
+ cxml::add_text_child(element, "AudioLength", raw_convert<string>(audio->stream()->length()));
+ audio->stream()->mapping().as_xml(cxml::add_child(element, "AudioMapping"));
}
for (auto i: text) {
- i->as_xml (node);
+ i->as_xml(element);
}
if (atmos) {
- atmos->as_xml (node);
+ atmos->as_xml(element);
}
boost::mutex::scoped_lock lm (_mutex);
- node->add_child("Name")->add_child_text (_name);
- node->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
- node->add_child("NeedsAssets")->add_child_text (_needs_assets ? "1" : "0");
+
+ cxml::add_text_child(element, "Name", _name);
+ cxml::add_text_child(element, "Encrypted", _encrypted ? "1" : "0");
+ cxml::add_text_child(element, "NeedsAssets", _needs_assets ? "1" : "0");
if (_kdm) {
- node->add_child("KDM")->add_child_text (_kdm->as_xml ());
+ cxml::add_text_child(element, "KDM", _kdm->as_xml());
}
- node->add_child("KDMValid")->add_child_text (_kdm_valid ? "1" : "0");
- node->add_child("ReferenceVideo")->add_child_text (_reference_video ? "1" : "0");
- node->add_child("ReferenceAudio")->add_child_text (_reference_audio ? "1" : "0");
- node->add_child("ReferenceOpenSubtitle")->add_child_text(_reference_text[TEXT_OPEN_SUBTITLE] ? "1" : "0");
- node->add_child("ReferenceClosedCaption")->add_child_text(_reference_text[TEXT_CLOSED_CAPTION] ? "1" : "0");
+ cxml::add_text_child(element, "KDMValid", _kdm_valid ? "1" : "0");
+ cxml::add_text_child(element, "ReferenceVideo", _reference_video ? "1" : "0");
+ cxml::add_text_child(element, "ReferenceAudio", _reference_audio ? "1" : "0");
+ cxml::add_text_child(element, "ReferenceOpenSubtitle", _reference_text[TextType::OPEN_SUBTITLE] ? "1" : "0");
+ cxml::add_text_child(element, "ReferenceClosedCaption", _reference_text[TextType::CLOSED_CAPTION] ? "1" : "0");
if (_standard) {
switch (_standard.get ()) {
- case dcp::INTEROP:
- node->add_child("Standard")->add_child_text ("Interop");
+ case dcp::Standard::INTEROP:
+ cxml::add_text_child(element, "Standard", "Interop");
break;
- case dcp::SMPTE:
- node->add_child("Standard")->add_child_text ("SMPTE");
+ case dcp::Standard::SMPTE:
+ cxml::add_text_child(element, "Standard", "SMPTE");
break;
default:
DCPOMATIC_ASSERT (false);
}
}
- node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
+ cxml::add_text_child(element, "ThreeD", _three_d ? "1" : "0");
if (_content_kind) {
- node->add_child("ContentKind")->add_child_text(dcp::content_kind_to_string(*_content_kind));
+ cxml::add_text_child(element, "ContentKind", _content_kind->name());
}
if (_cpl) {
- node->add_child("CPL")->add_child_text (_cpl.get ());
+ cxml::add_text_child(element, "CPL", _cpl.get());
}
for (auto i: _reel_lengths) {
- node->add_child("ReelLength")->add_child_text (raw_convert<string> (i));
+ cxml::add_text_child(element, "ReelLength", raw_convert<string>(i));
}
- for (map<dcp::Marker, ContentTime>::const_iterator i = _markers.begin(); i != _markers.end(); ++i) {
- xmlpp::Element* marker = node->add_child("Marker");
- marker->set_attribute("type", dcp::marker_to_string(i->first));
- marker->add_child_text(raw_convert<string>(i->second.get()));
+ for (auto const& i: _markers) {
+ auto marker = cxml::add_child(element, "Marker");
+ marker->set_attribute("type", dcp::marker_to_string(i.first));
+ marker->add_child_text(raw_convert<string>(i.second.get()));
}
for (auto i: _ratings) {
- xmlpp::Element* rating = node->add_child("Rating");
+ auto rating = cxml::add_child(element, "Rating");
i.as_xml (rating);
}
for (auto i: _content_versions) {
- node->add_child("ContentVersion")->add_child_text(i);
+ cxml::add_text_child(element, "ContentVersion", i);
+ }
+
+ if (_active_audio_channels) {
+ cxml::add_text_child(element, "ActiveAudioChannels", raw_convert<string>(*_active_audio_channels));
}
}
+
DCPTime
DCPContent::full_length (shared_ptr<const Film> film) const
{
if (!video) {
- return DCPTime();
+ return {};
}
FrameRateChange const frc (film, shared_from_this());
return DCPTime::from_frames (llrint(video->length() * frc.factor()), film->video_frame_rate());
DCPContent::approximate_length () const
{
if (!video) {
- return DCPTime();
+ return {};
}
return DCPTime::from_frames (video->length(), 24);
}
s += i->identifier () + " ";
}
+ boost::mutex::scoped_lock lm(_mutex);
+
s += string (_reference_video ? "1" : "0");
- for (int i = 0; i < TEXT_COUNT; ++i) {
- s += string (_reference_text[i] ? "1" : "0");
+ for (auto text: _reference_text) {
+ s += string(text ? "1" : "0");
}
return s;
}
void
DCPContent::set_reference_video (bool r)
{
- ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_VIDEO);
+ ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_VIDEO);
{
boost::mutex::scoped_lock lm (_mutex);
void
DCPContent::set_reference_audio (bool r)
{
- ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_AUDIO);
+ ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_AUDIO);
{
boost::mutex::scoped_lock lm (_mutex);
void
DCPContent::set_reference_text (TextType type, bool r)
{
- ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_TEXT);
+ ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_TEXT);
{
boost::mutex::scoped_lock lm (_mutex);
list<DCPTimePeriod>
DCPContent::reels (shared_ptr<const Film> film) const
{
- list<int64_t> reel_lengths = _reel_lengths;
- if (reel_lengths.empty ()) {
+ auto reel_lengths = _reel_lengths;
+ if (reel_lengths.empty()) {
/* Old metadata with no reel lengths; get them here instead */
try {
scoped_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film->tolerant()));
*/
/* The starting point of this content on the timeline */
- DCPTime pos = position() - DCPTime (trim_start().get());
+ auto pos = position() - DCPTime (trim_start().get());
for (auto i: reel_lengths) {
/* This reel runs from `pos' to `to' */
DCPTime const to = pos + DCPTime::from_frames (i, film->video_frame_rate());
if (to > position()) {
- p.push_back (DCPTimePeriod (max(position(), pos), min(end(film), to)));
+ p.push_back (DCPTimePeriod(max(position(), pos), min(end(film), to)));
if (to > end(film)) {
break;
}
{
/* We must be using the same standard as the film */
if (_standard) {
- if (_standard.get() == dcp::INTEROP && !film->interop()) {
+ if (_standard.get() == dcp::Standard::INTEROP && !film->interop()) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
why_not = _("it is Interop and the film is set to SMPTE.");
return false;
- } else if (_standard.get() == dcp::SMPTE && film->interop()) {
+ } else if (_standard.get() == dcp::Standard::SMPTE && film->interop()) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
why_not = _("it is SMPTE and the film is set to Interop.");
return false;
return false;
}
- list<DCPTimePeriod> const fr = film->reels ();
+ auto const fr = film->reels ();
list<DCPTimePeriod> reel_list;
try {
}
}
- ContentList a = overlaps (film, film->content(), part, position(), end(film));
+ auto a = overlaps (film, film->content(), part, position(), end(film));
if (a.size() != 1 || a.front().get() != this) {
why_not = overlapping;
return false;
return true;
}
-static
-bool check_video (shared_ptr<const Content> c)
-{
- return static_cast<bool>(c->video) && c->video->use();
-}
bool
DCPContent::can_reference_video (shared_ptr<const Film> film, string& why_not) const
}
if (film->resolution() != resolution()) {
- if (resolution() == RESOLUTION_4K) {
+ if (resolution() == Resolution::FOUR_K) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
why_not = _("it is 4K and the film is 2K.");
} else {
}
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- return can_reference (film, bind (&check_video, _1), _("it overlaps other video content; remove the other content."), why_not);
+ return can_reference(
+ film,
+ [](shared_ptr<const Content> c) {
+ return static_cast<bool>(c->video) && c->video->use();
+ },
+ _("it overlaps other video content; remove the other content."),
+ why_not
+ );
}
-static
-bool check_audio (shared_ptr<const Content> c)
-{
- return static_cast<bool>(c->audio) && !c->audio->mapping().mapped_output_channels().empty();
-}
bool
DCPContent::can_reference_audio (shared_ptr<const Film> film, string& why_not) const
{
shared_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>()));
+ decoder = make_shared<DCPDecoder>(film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>());
} catch (dcp::ReadError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
return false;
}
- for (auto i: decoder->reels()) {
- if (!i->main_sound()) {
- /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- why_not = _("it does not have sound in all its reels.");
- return false;
- }
- }
-
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- return can_reference (film, bind (&check_audio, _1), _("it overlaps other audio content; remove the other content."), why_not);
+ return can_reference(
+ film, [](shared_ptr<const Content> c) {
+ return static_cast<bool>(c->audio) && !c->audio->mapping().mapped_output_channels().empty();
+ },
+ _("it overlaps other audio content; remove the other content."),
+ why_not
+ );
}
-static
-bool check_text (shared_ptr<const Content> c)
-{
- return !c->text.empty();
-}
bool
DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, string& why_not) const
{
shared_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>()));
+ decoder = make_shared<DCPDecoder>(film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>());
} catch (dcp::ReadError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
+ } catch (DCPError &) {
+ /* We couldn't read the DCP, so it's probably missing */
+ return false;
} catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
for (auto i: decoder->reels()) {
- if (type == TEXT_OPEN_SUBTITLE) {
- if (!i->main_subtitle()) {
+ if (type == TextType::OPEN_SUBTITLE) {
+ if (i->main_subtitle() && i->main_subtitle()->entry_point().get_value_or(0) != 0) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- why_not = _("it does not have open subtitles in all its reels.");
- return false;
- } else if (i->main_subtitle()->entry_point().get_value_or(0) != 0) {
- /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- why_not = _("one if its subtitle reels has a non-zero entry point so it must be re-written.");
+ why_not = _("one of its subtitle reels has a non-zero entry point so it must be re-written.");
return false;
}
}
- if (type == TEXT_CLOSED_CAPTION) {
- if (i->closed_captions().empty()) {
- /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- why_not = _("it does not have closed captions in all its reels.");
- return false;
- }
+ if (type == TextType::CLOSED_CAPTION) {
for (auto j: i->closed_captions()) {
if (j->entry_point().get_value_or(0) != 0) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- why_not = _("one if its closed caption has a non-zero entry point so it must be re-written.");
+ why_not = _("one of its closed caption has a non-zero entry point so it must be re-written.");
return false;
}
}
}
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- return can_reference (film, bind (&check_text, _1), _("it overlaps other text content; remove the other content."), why_not);
+ return can_reference(
+ film,
+ [type](shared_ptr<const Content> c) {
+ return std::find_if(c->text.begin(), c->text.end(), [type](shared_ptr<const TextContent> t) { return t->type() == type; }) != c->text.end();
+ },
+ _("they overlap other text content; remove the other content."),
+ why_not
+ );
}
void
DCPContent::take_settings_from (shared_ptr<const Content> c)
{
- shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (c);
+ auto dc = dynamic_pointer_cast<const DCPContent>(c);
if (!dc) {
return;
}
+ if (this == dc.get()) {
+ return;
+ }
+
+ boost::mutex::scoped_lock lm(_mutex);
+ boost::mutex::scoped_lock lm2(dc->_mutex);
+
_reference_video = dc->_reference_video;
_reference_audio = dc->_reference_audio;
- for (int i = 0; i < TEXT_COUNT; ++i) {
- _reference_text[i] = dc->_reference_text[i];
- }
+ _reference_text = dc->_reference_text;
}
void
DCPContent::set_cpl (string id)
{
- ChangeSignaller<Content> cc (this, DCPContentProperty::CPL);
+ ContentChangeSignaller cc (this, DCPContentProperty::CPL);
{
boost::mutex::scoped_lock lm (_mutex);
Resolution
DCPContent::resolution () const
{
- if (video->size().width > 2048 || video->size().height > 1080) {
- return RESOLUTION_4K;
+ if (video->size() && (video->size()->width > 2048 || video->size()->height > 1080)) {
+ return Resolution::FOUR_K;
}
- return RESOLUTION_2K;
+ return Resolution::TWO_K;
+}
+
+
+void
+DCPContent::check_font_ids()
+{
+ if (text.empty()) {
+ return;
+ }
+
+ DCPExaminer examiner(shared_from_this(), true);
+ examiner.add_fonts(text.front());
+}
+
+
+int
+DCPContent::active_audio_channels() const
+{
+ return _active_audio_channels.get_value_or(
+ (audio && audio->stream()) ? audio->stream()->channels() : 0
+ );
}