X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcp_content.cc;h=3498cc96119940bbd2a25a4546c0c1fc0bc56662;hb=234bca29f70aeeba4fffd67f987de876ff89b6cc;hp=a6424874adb6978d488693c542fb4122d0206da6;hpb=160a401d16e3962b10f3105e00992936a8188424;p=dcpomatic.git diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index a6424874a..3498cc961 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2016 Carl Hetherington + Copyright (C) 2014-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -28,7 +28,7 @@ #include "overlaps.h" #include "compose.hpp" #include "dcp_decoder.h" -#include "subtitle_content.h" +#include "text_content.h" #include #include #include @@ -58,9 +58,10 @@ 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_SUBTITLE = 604; +int const DCPContentProperty::REFERENCE_TEXT = 604; int const DCPContentProperty::NAME = 605; -int const DCPContentProperty::HAS_SUBTITLES = 606; +int const DCPContentProperty::TEXTS = 606; +int const DCPContentProperty::CPL = 607; DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) : Content (film) @@ -69,14 +70,14 @@ DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) , _kdm_valid (false) , _reference_video (false) , _reference_audio (false) - , _reference_subtitle (false) , _three_d (false) { - video.reset (new VideoContent (this)); - audio.reset (new AudioContent (this)); - read_directory (p); set_default_colour_conversion (); + + for (int i = 0; i < TEXT_COUNT; ++i) { + _reference_text[i] = false; + } } DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, int version) @@ -84,20 +85,26 @@ DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, in { video = VideoContent::from_xml (this, node, version); audio = AudioContent::from_xml (this, node, version); - subtitle = SubtitleContent::from_xml (this, node, version); - - audio->set_stream ( - AudioStreamPtr ( - new AudioStream ( - node->number_child ("AudioFrameRate"), - /* AudioLength was not present in some old metadata versions */ - node->optional_number_child("AudioLength").get_value_or ( - video->length() * node->number_child("AudioFrameRate") / video_frame_rate().get() - ), - AudioMapping (node->node_child ("AudioMapping"), version) + text = TextContent::from_xml (this, node, version); + + for (int i = 0; i < TEXT_COUNT; ++i) { + _reference_text[i] = false; + } + + if (video && audio) { + audio->set_stream ( + AudioStreamPtr ( + new AudioStream ( + node->number_child ("AudioFrameRate"), + /* AudioLength was not present in some old metadata versions */ + node->optional_number_child("AudioLength").get_value_or ( + video->length() * node->number_child("AudioFrameRate") / video_frame_rate().get() + ), + AudioMapping (node->node_child ("AudioMapping"), version) + ) ) - ) - ); + ); + } _name = node->string_child ("Name"); _encrypted = node->bool_child ("Encrypted"); @@ -108,7 +115,13 @@ DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, in _kdm_valid = node->bool_child ("KDMValid"); _reference_video = node->optional_bool_child ("ReferenceVideo").get_value_or (false); _reference_audio = node->optional_bool_child ("ReferenceAudio").get_value_or (false); - _reference_subtitle = node->optional_bool_child ("ReferenceSubtitle").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); + } else { + _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(); if (s == "Interop") { @@ -131,7 +144,7 @@ DCPContent::read_directory (boost::filesystem::path p) { 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()); + add_path (i->path()); } else if (boost::filesystem::is_directory (i->path ())) { read_directory (i->path()); } @@ -144,7 +157,13 @@ DCPContent::examine (shared_ptr job) bool const needed_assets = needs_assets (); bool const needed_kdm = needs_kdm (); string const old_name = name (); - bool had_subtitles = static_cast (subtitle); + int const old_texts = text.size (); + + ChangeSignaller cc_texts (this, DCPContentProperty::TEXTS); + ChangeSignaller cc_assets (this, DCPContentProperty::NEEDS_ASSETS); + ChangeSignaller cc_kdm (this, DCPContentProperty::NEEDS_KDM); + ChangeSignaller cc_name (this, DCPContentProperty::NAME); + ChangeSignaller cc_streams (this, AudioContentProperty::STREAMS); if (job) { job->set_progress_unknown (); @@ -152,12 +171,22 @@ DCPContent::examine (shared_ptr job) Content::examine (job); shared_ptr examiner (new DCPExaminer (shared_from_this ())); - video->take_from_examiner (examiner); - set_default_colour_conversion (); - { - boost::mutex::scoped_lock lm (_mutex); + if (examiner->has_video()) { + { + boost::mutex::scoped_lock lm (_mutex); + video.reset (new VideoContent (this)); + } + video->take_from_examiner (examiner); + set_default_colour_conversion (); + } + if (examiner->has_audio()) { + ChangeSignaller cc (this, AudioContentProperty::STREAMS); + { + boost::mutex::scoped_lock lm (_mutex); + audio.reset (new AudioContent (this)); + } AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels())); audio->set_stream (as); AudioMapping m = as->mapping (); @@ -165,18 +194,16 @@ DCPContent::examine (shared_ptr job) as->set_mapping (m); } - signal_changed (AudioContentProperty::STREAMS); - - bool has_subtitles = false; + int texts = 0; { boost::mutex::scoped_lock lm (_mutex); _name = examiner->name (); - if (examiner->has_subtitles ()) { - subtitle.reset (new SubtitleContent (this)); - } else { - subtitle.reset (); + for (int i = 0; i < TEXT_COUNT; ++i) { + if (examiner->has_text(static_cast(i))) { + text.push_back (shared_ptr(new TextContent(this, static_cast(i), static_cast(i)))); + } } - has_subtitles = static_cast (subtitle); + texts = text.size (); _encrypted = examiner->encrypted (); _needs_assets = examiner->needs_assets (); _kdm_valid = examiner->kdm_valid (); @@ -186,23 +213,25 @@ DCPContent::examine (shared_ptr job) _reel_lengths = examiner->reel_lengths (); } - if (had_subtitles != has_subtitles) { - signal_changed (DCPContentProperty::HAS_SUBTITLES); + 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 (); } - video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D); + if (video) { + video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D); + } } string @@ -215,9 +244,14 @@ DCPContent::summary () const string DCPContent::technical_summary () const { - return Content::technical_summary() + " - " - + video->technical_summary() + " - " - + audio->technical_summary() + " - "; + string s = Content::technical_summary() + " - "; + if (video) { + s += video->technical_summary() + " - "; + } + if (audio) { + s += audio->technical_summary() + " - "; + } + return s; } void @@ -238,8 +272,8 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const audio->stream()->mapping().as_xml (node->add_child("AudioMapping")); } - if (subtitle) { - subtitle->as_xml (node); + BOOST_FOREACH (shared_ptr i, text) { + i->as_xml (node); } boost::mutex::scoped_lock lm (_mutex); @@ -252,7 +286,8 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const 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("ReferenceSubtitle")->add_child_text (_reference_subtitle ? "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: @@ -277,6 +312,9 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const DCPTime DCPContent::full_length () 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 ()); } @@ -284,12 +322,20 @@ DCPContent::full_length () const string DCPContent::identifier () const { - string s = Content::identifier() + "_" + video->identifier() + "_"; - if (subtitle) { - s += subtitle->identifier () + " "; + string s = Content::identifier() + "_"; + + if (video) { + s += video->identifier() + "_"; + } + + BOOST_FOREACH (shared_ptr i, text) { + s += i->identifier () + " "; } - s += string (_reference_video ? "1" : "0") + string (_reference_subtitle ? "1" : "0"); + s += string (_reference_video ? "1" : "0"); + for (int i = 0; i < TEXT_COUNT; ++i) { + s += string (_reference_text[i] ? "1" : "0"); + } return s; } @@ -335,48 +381,54 @@ void DCPContent::add_properties (list& p) const { Content::add_properties (p); - video->add_properties (p); - audio->add_properties (p); + if (video) { + video->add_properties (p); + } + if (audio) { + audio->add_properties (p); + } } void DCPContent::set_default_colour_conversion () { /* Default to no colour conversion for DCPs */ - video->unset_colour_conversion (); + if (video) { + video->unset_colour_conversion (); + } } void DCPContent::set_reference_video (bool r) { + ChangeSignaller 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 cc (this, DCPContentProperty::REFERENCE_AUDIO); + { boost::mutex::scoped_lock lm (_mutex); _reference_audio = r; } - - signal_changed (DCPContentProperty::REFERENCE_AUDIO); } void -DCPContent::set_reference_subtitle (bool r) +DCPContent::set_reference_text (TextType type, bool r) { + ChangeSignaller cc (this, DCPContentProperty::REFERENCE_TEXT); + { boost::mutex::scoped_lock lm (_mutex); - _reference_subtitle = r; + _reference_text[type] = r; } - - signal_changed (DCPContentProperty::REFERENCE_SUBTITLE); } list @@ -429,22 +481,25 @@ DCPContent::reel_split_points () const } bool -DCPContent::can_reference (function (shared_ptr)> part, string overlapping, list& why_not) const +DCPContent::can_reference (function)> 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()) { - why_not.push_back (_("The film is set to SMPTE and this DCP is 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()) { - why_not.push_back (_("The film is set to Interop and this DCP is SMPTE.")); + /// 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())) { - why_not.push_back (_("The film has a different frame rate to this DCP.")); + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("it has a different frame rate to the film."); return false; } @@ -466,33 +521,53 @@ DCPContent::can_reference (function (shared_ptrcontent(), part, position(), end()); if (a.size() != 1 || a.front().get() != this) { - why_not.push_back (overlapping); + why_not = overlapping; return false; } return true; } +static +bool check_video (shared_ptr c) +{ + return static_cast(c->video); +} + bool -DCPContent::can_reference_video (list& why_not) const +DCPContent::can_reference_video (string& why_not) const { + if (!video) { + why_not = _("There is no video in this DCP"); + return false; + } + if (film()->frame_size() != video->size()) { - why_not.push_back (_("The video frame size in the film differs from that in the DCP.")); + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("its video frame size differs from the film's."); return false; } - return can_reference (bind (&Content::video, _1), _("There is other video content overlapping this DCP; remove it."), why_not); + /// 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); +} + +static +bool check_audio (shared_ptr c) +{ + return static_cast(c->audio); } bool -DCPContent::can_reference_audio (list& why_not) const +DCPContent::can_reference_audio (string& why_not) const { shared_ptr decoder; try { @@ -500,6 +575,9 @@ DCPContent::can_reference_audio (list& why_not) const } catch (dcp::DCPReadError) { /* 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; @@ -507,16 +585,24 @@ DCPContent::can_reference_audio (list& why_not) const BOOST_FOREACH (shared_ptr i, decoder->reels()) { if (!i->main_sound()) { - why_not.push_back (_("The DCP does not have sound in all reels.")); + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("it does not have sound in all its reels."); return false; } } - return can_reference (bind (&Content::audio, _1), _("There is other audio content overlapping this DCP; remove it."), why_not); + /// 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); +} + +static +bool check_text (shared_ptr c) +{ + return !c->text.empty(); } bool -DCPContent::can_reference_subtitle (list& why_not) const +DCPContent::can_reference_text (TextType type, string& why_not) const { shared_ptr decoder; try { @@ -530,29 +616,55 @@ DCPContent::can_reference_subtitle (list& why_not) const } BOOST_FOREACH (shared_ptr i, decoder->reels()) { - if (!i->main_subtitle()) { - why_not.push_back (_("The DCP does not have subtitles in all reels.")); + if (type == TEXT_OPEN_SUBTITLE && !i->main_subtitle()) { + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("it does not have open subtitles in all its reels."); return false; } + 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; + } } - return can_reference (bind (&Content::subtitle, _1), _("There is other subtitle content overlapping this DCP; remove it."), why_not); + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + return can_reference (bind (&check_text, _1), _("it overlaps other text content; remove the other content."), why_not); } void DCPContent::take_settings_from (shared_ptr c) { shared_ptr dc = dynamic_pointer_cast (c); - DCPOMATIC_ASSERT (dc); + if (!dc) { + return; + } _reference_video = dc->_reference_video; _reference_audio = dc->_reference_audio; - _reference_subtitle = dc->_reference_subtitle; + 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 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(); }