/*
- Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "overlaps.h"
#include "compose.hpp"
#include "dcp_decoder.h"
-#include "caption_content.h"
+#include "log.h"
+#include "dcpomatic_log.h"
+#include "text_content.h"
#include <dcp/dcp.h>
#include <dcp/raw_convert.h>
#include <dcp/exceptions.h>
using std::pair;
using std::vector;
using std::list;
+using std::map;
using boost::shared_ptr;
using boost::scoped_ptr;
using boost::optional;
using boost::function;
using boost::dynamic_pointer_cast;
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::REFERENCE_AUDIO = 603;
-int const DCPContentProperty::REFERENCE_CAPTION = 604;
+int const DCPContentProperty::REFERENCE_TEXT = 604;
int const DCPContentProperty::NAME = 605;
-int const DCPContentProperty::CAPTIONS = 606;
+int const DCPContentProperty::TEXTS = 606;
+int const DCPContentProperty::CPL = 607;
-DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
- : Content (film)
- , _encrypted (false)
+DCPContent::DCPContent (boost::filesystem::path p)
+ : _encrypted (false)
, _needs_assets (false)
, _kdm_valid (false)
, _reference_video (false)
, _reference_audio (false)
, _three_d (false)
{
+ LOG_GENERAL ("Creating DCP content from %1", p.string());
+
read_directory (p);
set_default_colour_conversion ();
- for (int i = 0; i < CAPTION_COUNT; ++i) {
- _reference_caption[i] = false;
+ for (int i = 0; i < TEXT_COUNT; ++i) {
+ _reference_text[i] = false;
}
}
-DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
- : Content (film, node)
+DCPContent::DCPContent (cxml::ConstNodePtr node, int version)
+ : Content (node)
{
video = VideoContent::from_xml (this, node, version);
audio = AudioContent::from_xml (this, node, version);
- caption = CaptionContent::from_xml (this, node, version);
+ text = TextContent::from_xml (this, node, version);
- for (int i = 0; i < CAPTION_COUNT; ++i) {
- _reference_caption[i] = false;
+ for (int i = 0; i < TEXT_COUNT; ++i) {
+ _reference_text[i] = false;
}
if (video && audio) {
_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_caption[CAPTION_OPEN] = node->optional_bool_child("ReferenceOpenCaption").get_value_or(false);
- _reference_caption[CAPTION_CLOSED] = node->optional_bool_child("ReferenceClosedCaption").get_value_or(false);
+ _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);
} else {
- _reference_caption[CAPTION_OPEN] = node->optional_bool_child("ReferenceSubtitle").get_value_or(false);
- _reference_caption[CAPTION_CLOSED] = false;
+ _reference_text[TEXT_OPEN_SUBTITLE] = node->optional_bool_child("ReferenceSubtitle").get_value_or(false);
+ _reference_text[TEXT_CLOSED_CAPTION] = false;
}
if (node->optional_string_child("Standard")) {
string const s = node->optional_string_child("Standard").get();
}
}
_three_d = node->optional_bool_child("ThreeD").get_value_or (false);
+
+ optional<string> ck = node->optional_string_child("ContentKind");
+ if (ck) {
+ _content_kind = dcp::content_kind_from_string (*ck);
+ }
_cpl = node->optional_string_child("CPL");
BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("ReelLength")) {
_reel_lengths.push_back (raw_convert<int64_t> (i->content ()));
}
+
+ BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Marker")) {
+ _markers[dcp::marker_from_string(i->string_attribute("type"))] = ContentTime(raw_convert<int64_t>(i->content()));
+ }
+
+ BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Rating")) {
+ _ratings.push_back (dcp::Rating(i));
+ }
+
+ _content_version = node->optional_string_child("ContentVersion").get_value_or("");
}
void
DCPContent::read_directory (boost::filesystem::path p)
{
+ read_sub_directory (p);
+
+ bool have_assetmap = false;
+ BOOST_FOREACH (boost::filesystem::path i, paths()) {
+ if (i.filename() == "ASSETMAP" || i.filename() == "ASSETMAP.xml") {
+ have_assetmap = true;
+ }
+ }
+
+ if (!have_assetmap) {
+ throw DCPError ("No ASSETMAP or ASSETMAP.xml file found: is this a DCP?");
+ }
+}
+
+void
+DCPContent::read_sub_directory (boost::filesystem::path p)
+{
+ 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())) {
- _paths.push_back (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 ())) {
- read_directory (i->path());
+ LOG_GENERAL ("Inside there's directory %1", i->path().string());
+ read_sub_directory (i->path());
}
}
}
+/** @param film Film, or 0 */
void
-DCPContent::examine (shared_ptr<Job> job)
+DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
{
bool const needed_assets = needs_assets ();
bool const needed_kdm = needs_kdm ();
string const old_name = name ();
- int const old_captions = caption.size ();
+ int const old_texts = text.size ();
+
+ 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);
if (job) {
job->set_progress_unknown ();
}
- Content::examine (job);
+ Content::examine (film, job);
- shared_ptr<DCPExaminer> examiner (new DCPExaminer (shared_from_this ()));
+ shared_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film ? film->tolerant() : true));
if (examiner->has_video()) {
{
AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels()));
audio->set_stream (as);
AudioMapping m = as->mapping ();
- film()->make_audio_mapping_default (m);
+ m.make_default (film ? film->audio_processor() : 0);
as->set_mapping (m);
- signal_changed (AudioContentProperty::STREAMS);
}
- int captions = 0;
+ int texts = 0;
{
boost::mutex::scoped_lock lm (_mutex);
_name = examiner->name ();
- for (int i = 0; i < CAPTION_COUNT; ++i) {
- if (examiner->has_caption(static_cast<CaptionType>(i))) {
- caption.push_back (shared_ptr<CaptionContent>(new CaptionContent(this, static_cast<CaptionType>(i))));
+ for (int i = 0; i < TEXT_COUNT; ++i) {
+ for (int j = 0; j < examiner->text_count(static_cast<TextType>(i)); ++j) {
+ text.push_back (shared_ptr<TextContent>(new TextContent(this, static_cast<TextType>(i), static_cast<TextType>(i))));
}
}
- captions = caption.size ();
+ texts = text.size ();
_encrypted = examiner->encrypted ();
_needs_assets = examiner->needs_assets ();
_kdm_valid = examiner->kdm_valid ();
_standard = examiner->standard ();
_three_d = examiner->three_d ();
+ _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));
+ }
+ _ratings = examiner->ratings ();
+ _content_version = examiner->content_version ();
}
- if (old_captions != captions) {
- signal_changed (DCPContentProperty::CAPTIONS);
+ if (old_texts == texts) {
+ cc_texts.abort ();
}
- if (needed_assets != needs_assets ()) {
- signal_changed (DCPContentProperty::NEEDS_ASSETS);
+ if (needed_assets == needs_assets()) {
+ cc_assets.abort ();
}
- if (needed_kdm != needs_kdm ()) {
- signal_changed (DCPContentProperty::NEEDS_KDM);
+ if (needed_kdm == needs_kdm()) {
+ cc_kdm.abort ();
}
- if (old_name != name ()) {
- signal_changed (DCPContentProperty::NAME);
+ if (old_name == name()) {
+ cc_name.abort ();
}
- signal_changed (AudioContentProperty::STREAMS);
-
if (video) {
video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D);
}
audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
}
- BOOST_FOREACH (shared_ptr<CaptionContent> i, caption) {
+ BOOST_FOREACH (shared_ptr<TextContent> i, text) {
i->as_xml (node);
}
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("ReferenceOpenCaption")->add_child_text(_reference_caption[CAPTION_OPEN] ? "1" : "0");
- node->add_child("ReferenceClosedCaption")->add_child_text(_reference_caption[CAPTION_CLOSED] ? "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");
if (_standard) {
switch (_standard.get ()) {
case dcp::INTEROP:
}
}
node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
+ if (_content_kind) {
+ node->add_child("ContentKind")->add_child_text(dcp::content_kind_to_string(*_content_kind));
+ }
if (_cpl) {
node->add_child("CPL")->add_child_text (_cpl.get ());
}
BOOST_FOREACH (int64_t i, _reel_lengths) {
node->add_child("ReelLength")->add_child_text (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()));
+ }
+
+ BOOST_FOREACH (dcp::Rating i, _ratings) {
+ xmlpp::Element* rating = node->add_child("Rating");
+ i.as_xml (rating);
+ }
+
+ node->add_child("ContentVersion")->add_child_text (_content_version);
}
DCPTime
-DCPContent::full_length () const
+DCPContent::full_length (shared_ptr<const Film> film) const
{
if (!video) {
return DCPTime();
}
- FrameRateChange const frc (active_video_frame_rate (), film()->video_frame_rate ());
- return DCPTime::from_frames (llrint (video->length () * frc.factor ()), film()->video_frame_rate ());
+ FrameRateChange const frc (film, shared_from_this());
+ return DCPTime::from_frames (llrint(video->length() * frc.factor()), film->video_frame_rate());
+}
+
+DCPTime
+DCPContent::approximate_length () const
+{
+ if (!video) {
+ return DCPTime();
+ }
+ return DCPTime::from_frames (video->length(), 24);
}
string
s += video->identifier() + "_";
}
- BOOST_FOREACH (shared_ptr<CaptionContent> i, caption) {
+ BOOST_FOREACH (shared_ptr<TextContent> i, text) {
s += i->identifier () + " ";
}
s += string (_reference_video ? "1" : "0");
- for (int i = 0; i < CAPTION_COUNT; ++i) {
- s += string (_reference_caption[i] ? "1" : "0");
+ for (int i = 0; i < TEXT_COUNT; ++i) {
+ s += string (_reference_text[i] ? "1" : "0");
}
return s;
}
}
void
-DCPContent::add_properties (list<UserProperty>& p) const
+DCPContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
{
- Content::add_properties (p);
+ Content::add_properties (film, p);
if (video) {
video->add_properties (p);
}
if (audio) {
- audio->add_properties (p);
+ audio->add_properties (film, p);
}
}
void
DCPContent::set_reference_video (bool r)
{
+ ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_VIDEO);
+
{
boost::mutex::scoped_lock lm (_mutex);
_reference_video = r;
}
-
- signal_changed (DCPContentProperty::REFERENCE_VIDEO);
}
void
DCPContent::set_reference_audio (bool r)
{
+ ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_AUDIO);
+
{
boost::mutex::scoped_lock lm (_mutex);
_reference_audio = r;
}
-
- signal_changed (DCPContentProperty::REFERENCE_AUDIO);
}
void
-DCPContent::set_reference_caption (CaptionType type, bool r)
+DCPContent::set_reference_text (TextType type, bool r)
{
+ ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_TEXT);
+
{
boost::mutex::scoped_lock lm (_mutex);
- _reference_caption[type] = r;
+ _reference_text[type] = r;
}
-
- signal_changed (DCPContentProperty::REFERENCE_CAPTION);
}
list<DCPTimePeriod>
-DCPContent::reels () const
+DCPContent::reels (shared_ptr<const Film> film) const
{
list<int64_t> 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()));
+ scoped_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film->tolerant()));
reel_lengths = examiner->reel_lengths ();
} catch (...) {
/* Could not examine the DCP; guess reels */
- reel_lengths.push_back (length_after_trim().frames_round (film()->video_frame_rate ()));
+ reel_lengths.push_back (length_after_trim(film).frames_round(film->video_frame_rate()));
}
}
BOOST_FOREACH (int64_t i, reel_lengths) {
/* This reel runs from `pos' to `to' */
- DCPTime const to = pos + DCPTime::from_frames (i, film()->video_frame_rate());
+ DCPTime const to = pos + DCPTime::from_frames (i, film->video_frame_rate());
if (to > position()) {
- p.push_back (DCPTimePeriod (max(position(), pos), min(end(), to)));
- if (to > end()) {
+ p.push_back (DCPTimePeriod (max(position(), pos), min(end(film), to)));
+ if (to > end(film)) {
break;
}
}
}
list<DCPTime>
-DCPContent::reel_split_points () const
+DCPContent::reel_split_points (shared_ptr<const Film> film) const
{
list<DCPTime> s;
- BOOST_FOREACH (DCPTimePeriod i, reels()) {
+ BOOST_FOREACH (DCPTimePeriod i, reels(film)) {
s.push_back (i.from);
}
return s;
}
bool
-DCPContent::can_reference (function<bool (shared_ptr<const Content>)> part, string overlapping, string& why_not) const
+DCPContent::can_reference (shared_ptr<const Film> film, function<bool (shared_ptr<const Content>)> part, string overlapping, string& why_not) const
{
/* We must be using the same standard as the film */
if (_standard) {
- if (_standard.get() == dcp::INTEROP && !film()->interop()) {
+ if (_standard.get() == dcp::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::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;
}
/* And the same frame rate */
- if (!video_frame_rate() || (lrint(video_frame_rate().get()) != film()->video_frame_rate())) {
+ if (!video_frame_rate() || (lrint(video_frame_rate().get()) != film->video_frame_rate())) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
why_not = _("it has a different frame rate to the film.");
return false;
}
- list<DCPTimePeriod> const fr = film()->reels ();
+ list<DCPTimePeriod> const fr = film->reels ();
list<DCPTimePeriod> reel_list;
try {
- reel_list = reels ();
- } catch (dcp::DCPReadError) {
+ reel_list = reels (film);
+ } catch (dcp::ReadError &) {
/* We couldn't read the DCP; it's probably missing */
return false;
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
}
}
- ContentList a = overlaps (film()->content(), part, position(), end());
+ ContentList a = overlaps (film, film->content(), part, position(), end(film));
if (a.size() != 1 || a.front().get() != this) {
why_not = overlapping;
return false;
static
bool check_video (shared_ptr<const Content> c)
{
- return static_cast<bool>(c->video);
+ return static_cast<bool>(c->video) && c->video->use();
}
bool
-DCPContent::can_reference_video (string& why_not) const
+DCPContent::can_reference_video (shared_ptr<const Film> film, string& why_not) const
{
if (!video) {
why_not = _("There is no video in this DCP");
return false;
}
- if (film()->frame_size() != video->size()) {
+ if (film->resolution() != resolution()) {
+ if (resolution() == RESOLUTION_4K) {
+ /// 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: "
+ why_not = _("it is 2K and the film is 4K.");
+ }
+ return false;
+ } else if (film->frame_size() != video->size()) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
why_not = _("its video frame size differs from the film's.");
return false;
}
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- return can_reference (bind (&check_video, _1), _("it overlaps other video content; remove the other content."), why_not);
+ return can_reference (film, bind (&check_video, _1), _("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);
+ return static_cast<bool>(c->audio) && !c->audio->mapping().mapped_output_channels().empty();
}
bool
-DCPContent::can_reference_audio (string& why_not) const
+DCPContent::can_reference_audio (shared_ptr<const Film> film, string& why_not) const
{
shared_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false));
- } catch (dcp::DCPReadError) {
+ decoder.reset (new 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) {
+ } catch (DCPError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
}
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- return can_reference (bind (&check_audio, _1), _("it overlaps other audio content; remove the other content."), why_not);
+ return can_reference (film, bind (&check_audio, _1), _("it overlaps other audio content; remove the other content."), why_not);
}
static
-bool check_caption (shared_ptr<const Content> c)
+bool check_text (shared_ptr<const Content> c)
{
- return !c->caption.empty();
+ return !c->text.empty();
}
+
bool
-DCPContent::can_reference_caption (CaptionType type, string& why_not) const
+DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, string& why_not) const
{
shared_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false));
- } catch (dcp::DCPReadError) {
+ decoder.reset (new 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 (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder->reels()) {
- if (type == CAPTION_OPEN && !i->main_subtitle()) {
+ if (type == TEXT_OPEN_SUBTITLE && !i->main_subtitle()) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- why_not = _("it does not have subtitles in all its reels.");
+ why_not = _("it does not have open subtitles in all its reels.");
return false;
}
- if (type == CAPTION_CLOSED && !i->closed_caption()) {
+ if (type == TEXT_CLOSED_CAPTION && 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;
}
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
- return can_reference (bind (&check_caption, _1), _("it overlaps other caption content; remove the other content."), why_not);
+ return can_reference (film, bind (&check_text, _1), _("it overlaps other text content; remove the other content."), why_not);
}
void
_reference_video = dc->_reference_video;
_reference_audio = dc->_reference_audio;
- for (int i = 0; i < CAPTION_COUNT; ++i) {
- _reference_caption[i] = dc->_reference_caption[i];
+ for (int i = 0; i < TEXT_COUNT; ++i) {
+ _reference_text[i] = dc->_reference_text[i];
}
}
void
DCPContent::set_cpl (string id)
{
- boost::mutex::scoped_lock lm (_mutex);
- _cpl = id;
+ ChangeSignaller<Content> cc (this, DCPContentProperty::CPL);
+
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _cpl = id;
+ }
+}
+
+bool
+DCPContent::kdm_timing_window_valid () const
+{
+ if (!_kdm) {
+ return true;
+ }
+
+ dcp::LocalTime now;
+ return _kdm->not_valid_before() < now && now < _kdm->not_valid_after();
}
+
+
+Resolution
+DCPContent::resolution () const
+{
+ if (video->size().width > 2048 || video->size().height > 1080) {
+ return RESOLUTION_4K;
+ }
+
+ return RESOLUTION_2K;
+}
+
projects / dcpomatic.git / blobdiff