X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=fa6ec383f8ccae10bde9e6990dda77345948fc5c;hp=d4bd58e584099c9d937f5209e97639dbeb2a0f85;hb=b0d658e5c5b953b38e341a90518b5e7b2108811a;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26 diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index d4bd58e58..fa6ec383f 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -40,23 +40,23 @@ #include #include #include -#include #include #include #include "i18n.h" -using std::string; using std::cout; using std::distance; -using std::pair; -using std::vector; using std::list; +using std::make_shared; using std::map; +using std::pair; using std::shared_ptr; +using std::string; +using std::vector; using boost::scoped_ptr; using boost::optional; -using boost::function; +using std::function; using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; @@ -86,7 +86,7 @@ DCPContent::DCPContent (boost::filesystem::path p) read_directory (p); set_default_colour_conversion (); - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::COUNT); ++i) { _reference_text[i] = false; } } @@ -99,21 +99,19 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version) text = TextContent::from_xml (this, node, version); atmos = AtmosContent::from_xml (this, node); - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::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) - ) + make_shared ( + 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) ) ); } @@ -128,42 +126,42 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version) _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[static_cast(TextType::OPEN_SUBTITLE)] = node->optional_bool_child("ReferenceOpenSubtitle").get_value_or(false); + _reference_text[static_cast(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[static_cast(TextType::OPEN_SUBTITLE)] = node->optional_bool_child("ReferenceSubtitle").get_value_or(false); + _reference_text[static_cast(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 ck = node->optional_string_child("ContentKind"); + auto 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")) { + for (auto i: node->node_children("ReelLength")) { _reel_lengths.push_back (raw_convert (i->content ())); } - BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Marker")) { + for (auto i: node->node_children("Marker")) { _markers[dcp::marker_from_string(i->string_attribute("type"))] = ContentTime(raw_convert(i->content())); } - BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Rating")) { + for (auto i: node->node_children("Rating")) { _ratings.push_back (dcp::Rating(i)); } - BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("ContentVersion")) { + for (auto i: node->node_children("ContentVersion")) { _content_versions.push_back (i->content()); } } @@ -188,10 +186,7 @@ DCPContent::read_directory (boost::filesystem::path p) 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 (); } } @@ -202,13 +197,13 @@ 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())) { - 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()); + for (auto i: boost::filesystem::directory_iterator(p)) { + 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()); } } } @@ -221,22 +216,22 @@ DCPContent::examine (shared_ptr film, shared_ptr job) bool const needed_kdm = needs_kdm (); string const old_name = name (); - 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); + 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 examiner (new DCPExaminer(shared_from_this(), film ? film->tolerant() : true)); + auto examiner = make_shared(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(this); } video->take_from_examiner (examiner); set_default_colour_conversion (); @@ -245,11 +240,11 @@ DCPContent::examine (shared_ptr film, shared_ptr job) if (examiner->has_audio()) { { boost::mutex::scoped_lock lm (_mutex); - audio.reset (new AudioContent (this)); + audio = make_shared(this); } - AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels())); + auto as = make_shared(examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels()); audio->set_stream (as); - AudioMapping m = as->mapping (); + auto m = as->mapping (); m.make_default (film ? film->audio_processor() : 0); as->set_mapping (m); } @@ -257,7 +252,7 @@ DCPContent::examine (shared_ptr film, shared_ptr job) if (examiner->has_atmos()) { { boost::mutex::scoped_lock lm (_mutex); - atmos.reset (new AtmosContent(this)); + atmos = make_shared(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. @@ -266,15 +261,18 @@ DCPContent::examine (shared_ptr film, shared_ptr job) atmos->set_length (examiner->atmos_length()); } - list > new_text; - for (int i = 0; i < TEXT_COUNT; ++i) { - for (int j = 0; j < examiner->text_count(static_cast(i)); ++j) { - shared_ptr c(new TextContent(this, static_cast(i), static_cast(i))); - if (i == TEXT_CLOSED_CAPTION) { - c->set_dcp_track (examiner->dcp_text_track(j)); - } - new_text.push_back (c); - } + list> new_text; + + for (int i = 0; i < examiner->text_count(TextType::OPEN_SUBTITLE); ++i) { + auto c = make_shared(this, TextType::OPEN_SUBTITLE, TextType::OPEN_SUBTITLE); + c->set_language (examiner->open_subtitle_language()); + new_text.push_back (c); + } + + for (int i = 0; i < examiner->text_count(TextType::CLOSED_CAPTION); ++i) { + auto c = make_shared(this, TextType::CLOSED_CAPTION, TextType::CLOSED_CAPTION); + c->set_dcp_track (examiner->dcp_text_track(i)); + new_text.push_back (c); } { @@ -289,9 +287,8 @@ DCPContent::examine (shared_ptr film, shared_ptr job) _content_kind = examiner->content_kind (); _cpl = examiner->cpl (); _reel_lengths = examiner->reel_lengths (); - map markers = examiner->markers(); - for (map::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 (); @@ -310,7 +307,7 @@ DCPContent::examine (shared_ptr film, shared_ptr job) } 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); } } @@ -352,7 +349,7 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const audio->stream()->mapping().as_xml (node->add_child("AudioMapping")); } - BOOST_FOREACH (shared_ptr i, text) { + for (auto i: text) { i->as_xml (node); } @@ -370,14 +367,14 @@ 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("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"); + node->add_child("ReferenceOpenSubtitle")->add_child_text(_reference_text[static_cast(TextType::OPEN_SUBTITLE)] ? "1" : "0"); + node->add_child("ReferenceClosedCaption")->add_child_text(_reference_text[static_cast(TextType::CLOSED_CAPTION)] ? "1" : "0"); if (_standard) { switch (_standard.get ()) { - case dcp::INTEROP: + case dcp::Standard::INTEROP: node->add_child("Standard")->add_child_text ("Interop"); break; - case dcp::SMPTE: + case dcp::Standard::SMPTE: node->add_child("Standard")->add_child_text ("SMPTE"); break; default: @@ -391,22 +388,22 @@ 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) { + for (auto i: _reel_lengths) { node->add_child("ReelLength")->add_child_text (raw_convert (i)); } - for (map::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(i->second.get())); + for (auto const& i: _markers) { + auto marker = node->add_child("Marker"); + marker->set_attribute("type", dcp::marker_to_string(i.first)); + marker->add_child_text(raw_convert(i.second.get())); } - BOOST_FOREACH (dcp::Rating i, _ratings) { - xmlpp::Element* rating = node->add_child("Rating"); + for (auto i: _ratings) { + auto rating = node->add_child("Rating"); i.as_xml (rating); } - BOOST_FOREACH (string i, _content_versions) { + for (auto i: _content_versions) { node->add_child("ContentVersion")->add_child_text(i); } } @@ -415,7 +412,7 @@ DCPTime DCPContent::full_length (shared_ptr 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()); @@ -425,7 +422,7 @@ DCPTime DCPContent::approximate_length () const { if (!video) { - return DCPTime(); + return {}; } return DCPTime::from_frames (video->length(), 24); } @@ -439,12 +436,12 @@ DCPContent::identifier () const s += video->identifier() + "_"; } - BOOST_FOREACH (shared_ptr i, text) { + for (auto i: text) { s += i->identifier () + " "; } s += string (_reference_video ? "1" : "0"); - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::COUNT); ++i) { s += string (_reference_text[i] ? "1" : "0"); } return s; @@ -512,7 +509,7 @@ DCPContent::set_default_colour_conversion () void DCPContent::set_reference_video (bool r) { - ChangeSignaller cc (this, DCPContentProperty::REFERENCE_VIDEO); + ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_VIDEO); { boost::mutex::scoped_lock lm (_mutex); @@ -523,7 +520,7 @@ DCPContent::set_reference_video (bool r) void DCPContent::set_reference_audio (bool r) { - ChangeSignaller cc (this, DCPContentProperty::REFERENCE_AUDIO); + ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_AUDIO); { boost::mutex::scoped_lock lm (_mutex); @@ -534,19 +531,19 @@ DCPContent::set_reference_audio (bool r) void DCPContent::set_reference_text (TextType type, bool r) { - ChangeSignaller cc (this, DCPContentProperty::REFERENCE_TEXT); + ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_TEXT); { boost::mutex::scoped_lock lm (_mutex); - _reference_text[type] = r; + _reference_text[static_cast(type)] = r; } } list DCPContent::reels (shared_ptr film) const { - list 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 examiner (new DCPExaminer(shared_from_this(), film->tolerant())); @@ -564,13 +561,13 @@ DCPContent::reels (shared_ptr film) const */ /* The starting point of this content on the timeline */ - DCPTime pos = position() - DCPTime (trim_start().get()); + auto pos = position() - DCPTime (trim_start().get()); - BOOST_FOREACH (int64_t i, reel_lengths) { + 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; } @@ -585,7 +582,7 @@ list DCPContent::reel_split_points (shared_ptr film) const { list s; - BOOST_FOREACH (DCPTimePeriod i, reels(film)) { + for (auto i: reels(film)) { s.push_back (i.from); } return s; @@ -596,11 +593,11 @@ DCPContent::can_reference (shared_ptr film, functioninterop()) { + 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; @@ -614,7 +611,7 @@ DCPContent::can_reference (shared_ptr film, function const fr = film->reels (); + auto const fr = film->reels (); list reel_list; try { @@ -630,7 +627,7 @@ DCPContent::can_reference (shared_ptr film, function film, functioncontent(), 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; @@ -662,7 +659,7 @@ DCPContent::can_reference_video (shared_ptr film, string& why_not) c } 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 { @@ -703,7 +700,7 @@ DCPContent::can_reference_audio (shared_ptr film, string& why_not) c return false; } - BOOST_FOREACH (shared_ptr i, decoder->reels()) { + 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."); @@ -735,28 +732,28 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri return false; } - BOOST_FOREACH (shared_ptr i, decoder->reels()) { - if (type == TEXT_OPEN_SUBTITLE) { + for (auto i: decoder->reels()) { + if (type == TextType::OPEN_SUBTITLE) { if (!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; } 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 (type == TextType::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; } - BOOST_FOREACH (shared_ptr j, i->closed_captions()) { + 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; } } @@ -776,14 +773,14 @@ DCPContent::can_reference_text (shared_ptr film, TextType type, stri void DCPContent::take_settings_from (shared_ptr c) { - shared_ptr dc = dynamic_pointer_cast (c); + auto dc = dynamic_pointer_cast(c); if (!dc) { return; } _reference_video = dc->_reference_video; _reference_audio = dc->_reference_audio; - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::COUNT); ++i) { _reference_text[i] = dc->_reference_text[i]; } } @@ -791,7 +788,7 @@ DCPContent::take_settings_from (shared_ptr c) void DCPContent::set_cpl (string id) { - ChangeSignaller cc (this, DCPContentProperty::CPL); + ContentChangeSignaller cc (this, DCPContentProperty::CPL); { boost::mutex::scoped_lock lm (_mutex); @@ -815,9 +812,9 @@ Resolution DCPContent::resolution () const { if (video->size().width > 2048 || video->size().height > 1080) { - return RESOLUTION_4K; + return Resolution::FOUR_K; } - return RESOLUTION_2K; + return Resolution::TWO_K; }