X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=aaf8064f3cfd66b597194840c584890589b232b7;hp=96e9f17a259f44e11b3b81859d0422b33308e6c0;hb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;hpb=8457b7c1066da4e14f00a76f3855e60d986b179f diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 96e9f17a2..aaf8064f3 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,7 +58,9 @@ 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_CAPTION = 604; +int const DCPContentProperty::NAME = 605; +int const DCPContentProperty::CAPTIONS = 606; DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) : Content (film) @@ -67,14 +69,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 < CAPTION_COUNT; ++i) { + _reference_caption[i] = false; + } } DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, int version) @@ -82,20 +84,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) + caption = TextContent::from_xml (this, node, version); + + for (int i = 0; i < CAPTION_COUNT; ++i) { + _reference_caption[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"); @@ -106,7 +114,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_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); + } else { + _reference_caption[CAPTION_OPEN] = node->optional_bool_child("ReferenceSubtitle").get_value_or(false); + _reference_caption[CAPTION_CLOSED] = false; + } if (node->optional_string_child("Standard")) { string const s = node->optional_string_child("Standard").get(); if (s == "Interop") { @@ -119,16 +133,19 @@ DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, in } _three_d = node->optional_bool_child("ThreeD").get_value_or (false); _cpl = node->optional_string_child("CPL"); + BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("ReelLength")) { + _reel_lengths.push_back (raw_convert (i->content ())); + } } void 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 ()); + if (boost::filesystem::is_regular_file (i->path())) { + _paths.push_back (i->path()); } else if (boost::filesystem::is_directory (i->path ())) { - read_directory (i->path ()); + read_directory (i->path()); } } } @@ -138,38 +155,59 @@ DCPContent::examine (shared_ptr job) { bool const needed_assets = needs_assets (); bool const needed_kdm = needs_kdm (); + string const old_name = name (); + int const old_captions = caption.size (); - job->set_progress_unknown (); + if (job) { + job->set_progress_unknown (); + } 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()) { + { + 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 (); film()->make_audio_mapping_default (m); as->set_mapping (m); + signal_changed (AudioContentProperty::STREAMS); } - signal_changed (AudioContentProperty::STREAMS); - + int captions = 0; { boost::mutex::scoped_lock lm (_mutex); _name = examiner->name (); - if (examiner->has_subtitles ()) { - subtitle.reset (new SubtitleContent (this)); + for (int i = 0; i < CAPTION_COUNT; ++i) { + if (examiner->has_caption(static_cast(i))) { + caption.push_back (shared_ptr(new TextContent(this, static_cast(i)))); + } } + captions = caption.size (); _encrypted = examiner->encrypted (); _needs_assets = examiner->needs_assets (); _kdm_valid = examiner->kdm_valid (); _standard = examiner->standard (); _three_d = examiner->three_d (); _cpl = examiner->cpl (); + _reel_lengths = examiner->reel_lengths (); + } + + if (old_captions != captions) { + signal_changed (DCPContentProperty::CAPTIONS); } if (needed_assets != needs_assets ()) { @@ -180,7 +218,15 @@ DCPContent::examine (shared_ptr job) signal_changed (DCPContentProperty::NEEDS_KDM); } - video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D); + if (old_name != name ()) { + signal_changed (DCPContentProperty::NAME); + } + + signal_changed (AudioContentProperty::STREAMS); + + if (video) { + video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D); + } } string @@ -193,9 +239,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 @@ -216,8 +267,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, caption) { + i->as_xml (node); } boost::mutex::scoped_lock lm (_mutex); @@ -230,7 +281,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("ReferenceOpenCaption")->add_child_text(_reference_caption[CAPTION_OPEN] ? "1" : "0"); + node->add_child("ReferenceClosedCaption")->add_child_text(_reference_caption[CAPTION_CLOSED] ? "1" : "0"); if (_standard) { switch (_standard.get ()) { case dcp::INTEROP: @@ -247,11 +299,17 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const 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 (i)); + } } 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 ()); } @@ -259,12 +317,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, caption) { + 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 < CAPTION_COUNT; ++i) { + s += string (_reference_caption[i] ? "1" : "0"); + } return s; } @@ -303,22 +369,28 @@ DCPContent::needs_assets () const vector DCPContent::directories () const { - return dcp::DCP::directories_from_files (paths ()); + return dcp::DCP::directories_from_files (paths()); } 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 @@ -344,30 +416,33 @@ DCPContent::set_reference_audio (bool r) } void -DCPContent::set_reference_subtitle (bool r) +DCPContent::set_reference_caption (TextType type, bool r) { { boost::mutex::scoped_lock lm (_mutex); - _reference_subtitle = r; + _reference_caption[type] = r; } - signal_changed (DCPContentProperty::REFERENCE_SUBTITLE); + signal_changed (DCPContentProperty::REFERENCE_CAPTION); } list DCPContent::reels () const { - list p; - scoped_ptr decoder; - try { - decoder.reset (new DCPDecoder (shared_from_this(), film()->log())); - } catch (...) { - /* Could not load the DCP; guess reels */ - list p; - p.push_back (DCPTimePeriod (position(), end())); - return p; + list reel_lengths = _reel_lengths; + if (reel_lengths.empty ()) { + /* Old metadata with no reel lengths; get them here instead */ + try { + scoped_ptr examiner (new DCPExaminer (shared_from_this())); + 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 ())); + } } + list p; + /* This content's frame rate must be the same as the output DCP rate, so we can convert `directly' from ContentTime to DCPTime. */ @@ -375,9 +450,9 @@ DCPContent::reels () const /* The starting point of this content on the timeline */ DCPTime pos = position() - DCPTime (trim_start().get()); - BOOST_FOREACH (shared_ptr i, decoder->reels ()) { + BOOST_FOREACH (int64_t i, reel_lengths) { /* This reel runs from `pos' to `to' */ - DCPTime const to = pos + DCPTime::from_frames (i->main_picture()->duration(), 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()) { @@ -401,87 +476,174 @@ 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; } list const fr = film()->reels (); + list reel_list; + try { + reel_list = reels (); + } catch (dcp::DCPReadError) { + /* We couldn't read the DCP; it's probably missing */ + return false; + } catch (dcp::KDMDecryptionError) { + /* We have an incorrect KDM */ + return false; + } + /* fr must contain reels(). It can also contain other reels, but it must at least contain reels(). */ - BOOST_FOREACH (DCPTimePeriod i, reels()) { + BOOST_FOREACH (DCPTimePeriod i, reel_list) { if (find (fr.begin(), fr.end(), i) == fr.end ()) { - why_not.push_back (_("The reel lengths in the film differ from those in the DCP; set the reel mode to 'split by video content'.")); + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("its reel lengths differ from those in the film; set the reel mode to 'split by video content'."); return false; } } ContentList a = overlaps (film()->content(), 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()) { + /// 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); +} + +static +bool check_audio (shared_ptr c) { - return can_reference (bind (&Content::video, _1), _("There is other video content overlapping this DCP; remove it."), why_not); + return static_cast(c->audio); } bool -DCPContent::can_reference_audio (list& why_not) const +DCPContent::can_reference_audio (string& why_not) const { - DCPDecoder decoder (shared_from_this(), film()->log()); - BOOST_FOREACH (shared_ptr i, decoder.reels()) { + shared_ptr decoder; + try { + decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false)); + } 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; + } + + 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_caption (shared_ptr c) +{ + return !c->caption.empty(); +} bool -DCPContent::can_reference_subtitle (list& why_not) const +DCPContent::can_reference_caption (TextType type, string& why_not) const { - DCPDecoder decoder (shared_from_this(), film()->log()); - BOOST_FOREACH (shared_ptr i, decoder.reels()) { - if (!i->main_subtitle()) { - why_not.push_back (_("The DCP does not have subtitles in all reels.")); + shared_ptr decoder; + try { + decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false)); + } catch (dcp::DCPReadError) { + /* We couldn't read the DCP, so it's probably missing */ + return false; + } catch (dcp::KDMDecryptionError) { + /* We have an incorrect KDM */ + return false; + } + + BOOST_FOREACH (shared_ptr i, decoder->reels()) { + if (type == CAPTION_OPEN && !i->main_subtitle()) { + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("it does not have subtitles in all its reels."); return false; } + if (type == CAPTION_CLOSED && !i->closed_caption()) { + /// 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_caption, _1), _("it overlaps other caption content; remove the other content."), why_not); } void -DCPContent::use_template (shared_ptr c) +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 < CAPTION_COUNT; ++i) { + _reference_caption[i] = dc->_reference_caption[i]; + } +} + +void +DCPContent::set_cpl (string id) +{ + boost::mutex::scoped_lock lm (_mutex); + _cpl = id; }