X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.cc;h=191022f1227666985eb3878b21937107153013d8;hp=8ce4aee001df26f64ca57cb2cb5d2d76c3e17172;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=cbd4450197a083bf58bda510e626f73ba583cb66 diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index 8ce4aee00..191022f12 100644 --- a/src/lib/dcp_examiner.cc +++ b/src/lib/dcp_examiner.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -23,6 +23,7 @@ #include "exceptions.h" #include "image.h" #include "config.h" +#include "util.h" #include #include #include @@ -38,10 +39,11 @@ #include #include #include +#include #include #include +#include #include -#include #include #include "i18n.h" @@ -49,26 +51,32 @@ using std::list; using std::cout; using std::runtime_error; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::map; +using std::shared_ptr; +using std::dynamic_pointer_cast; -DCPExaminer::DCPExaminer (shared_ptr content) - : DCP (content) +DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) + : DCP (content, tolerant) , _video_length (0) , _audio_length (0) , _has_video (false) , _has_audio (false) - , _captions (0) , _encrypted (false) , _needs_assets (false) , _kdm_valid (false) , _three_d (false) + , _has_atmos (false) + , _atmos_length (0) { shared_ptr cpl; + for (int i = 0; i < TEXT_COUNT; ++i) { + _text_count[i] = 0; + } + if (content->cpl ()) { /* Use the CPL that the content was using before */ - BOOST_FOREACH (shared_ptr i, cpls()) { + for (auto i: cpls()) { if (i->id() == content->cpl().get()) { cpl = i; } @@ -78,9 +86,9 @@ DCPExaminer::DCPExaminer (shared_ptr content) int least_unsatisfied = INT_MAX; - BOOST_FOREACH (shared_ptr i, cpls()) { + for (auto i: cpls()) { int unsatisfied = 0; - BOOST_FOREACH (shared_ptr j, i->reels()) { + for (auto j: i->reels()) { if (j->main_picture() && !j->main_picture()->asset_ref().resolved()) { ++unsatisfied; } @@ -90,6 +98,9 @@ DCPExaminer::DCPExaminer (shared_ptr content) if (j->main_subtitle() && !j->main_subtitle()->asset_ref().resolved()) { ++unsatisfied; } + if (j->atmos() && !j->atmos()->asset_ref().resolved()) { + ++unsatisfied; + } } if (unsatisfied < least_unsatisfied) { @@ -105,8 +116,9 @@ DCPExaminer::DCPExaminer (shared_ptr content) _cpl = cpl->id (); _name = cpl->content_title_text (); + _content_kind = cpl->content_kind (); - BOOST_FOREACH (shared_ptr i, cpl->reels()) { + for (auto i: cpl->reels()) { if (i->main_picture ()) { if (!i->main_picture()->asset_ref().resolved()) { @@ -131,7 +143,7 @@ DCPExaminer::DCPExaminer (shared_ptr content) throw DCPError (_("Mismatched video sizes in DCP")); } - _video_length += i->main_picture()->duration(); + _video_length += i->main_picture()->actual_duration(); } if (i->main_sound ()) { @@ -156,7 +168,7 @@ DCPExaminer::DCPExaminer (shared_ptr content) throw DCPError (_("Mismatched audio sample rates in DCP")); } - _audio_length += i->main_sound()->duration(); + _audio_length += i->main_sound()->actual_duration(); } if (i->main_subtitle ()) { @@ -166,27 +178,44 @@ DCPExaminer::DCPExaminer (shared_ptr content) return; } - ++_captions; + _text_count[TEXT_OPEN_SUBTITLE] = 1; } - if (i->closed_caption ()) { - if (!i->closed_caption()->asset_ref().resolved()) { + for (auto j: i->closed_captions()) { + if (!j->asset_ref().resolved()) { /* We are missing this asset so we can't continue; examination will be repeated later */ _needs_assets = true; return; } - ++_captions; + _text_count[TEXT_CLOSED_CAPTION]++; + _dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text(), j->language().get_value_or(_("Unknown")))); + } + + if (i->main_markers ()) { + map rm = i->main_markers()->get(); + _markers.insert (rm.begin(), rm.end()); + } + + if (i->atmos()) { + _has_atmos = true; + _atmos_length += i->atmos()->actual_duration(); + if (_atmos_edit_rate != dcp::Fraction()) { + DCPOMATIC_ASSERT (i->atmos()->edit_rate() == _atmos_edit_rate); + } + _atmos_edit_rate = i->atmos()->edit_rate(); } if (i->main_picture()) { - _reel_lengths.push_back (i->main_picture()->duration()); + _reel_lengths.push_back (i->main_picture()->actual_duration()); } else if (i->main_sound()) { - _reel_lengths.push_back (i->main_sound()->duration()); + _reel_lengths.push_back (i->main_sound()->actual_duration()); } else if (i->main_subtitle()) { - _reel_lengths.push_back (i->main_subtitle()->duration()); - } else if (i->closed_caption()) { - _reel_lengths.push_back (i->closed_caption()->duration()); + _reel_lengths.push_back (i->main_subtitle()->actual_duration()); + } else if (!i->closed_captions().empty()) { + _reel_lengths.push_back (i->closed_captions().front()->actual_duration()); + } else if (!i->atmos()) { + _reel_lengths.push_back (i->atmos()->actual_duration()); } } @@ -195,7 +224,7 @@ DCPExaminer::DCPExaminer (shared_ptr content) /* Check that we can read the first picture, sound and subtitle frames of each reel */ try { - BOOST_FOREACH (shared_ptr i, cpl->reels()) { + for (auto i: cpl->reels()) { shared_ptr pic = i->main_picture()->asset (); shared_ptr mono = dynamic_pointer_cast (pic); shared_ptr stereo = dynamic_pointer_cast (pic); @@ -214,8 +243,12 @@ DCPExaminer::DCPExaminer (shared_ptr content) if (i->main_subtitle()) { i->main_subtitle()->asset()->subtitles (); } + + if (i->atmos()) { + i->atmos()->asset()->start_read()->get_frame(0); + } } - } catch (dcp::DCPReadError& e) { + } catch (dcp::ReadError& e) { _kdm_valid = false; } catch (dcp::MiscError& e) { _kdm_valid = false; @@ -225,6 +258,10 @@ DCPExaminer::DCPExaminer (shared_ptr content) _standard = cpl->standard().get(); _three_d = !cpl->reels().empty() && cpl->reels().front()->main_picture() && dynamic_pointer_cast (cpl->reels().front()->main_picture()->asset()); + _ratings = cpl->ratings(); + for (auto i: cpl->content_versions()) { + _content_versions.push_back (i.label_text); + } _cpl = cpl->id (); }