X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.cc;h=ca851db2d941d3dda1cdaacce36b3f2f603f165a;hb=6485b4cb7afb020a8a4e8ff1a5b36544d25595a8;hp=44513ff452c7a8901c0b3721914fc2ef7d02e931;hpb=09860271bb6d03b3937c08bffb4c672697f6d711;p=dcpomatic.git diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index 44513ff45..ca851db2d 100644 --- a/src/lib/dcp_examiner.cc +++ b/src/lib/dcp_examiner.cc @@ -44,7 +44,6 @@ #include #include #include -#include #include #include "i18n.h" @@ -53,31 +52,21 @@ using std::list; using std::cout; using std::runtime_error; using std::map; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) : DCP (content, tolerant) - , _video_length (0) - , _audio_length (0) - , _has_video (false) - , _has_audio (false) - , _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) { + for (int i = 0; i < static_cast(TextType::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; } @@ -87,9 +76,9 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) 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; } @@ -119,7 +108,7 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) _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()) { @@ -128,7 +117,7 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) return; } - dcp::Fraction const frac = i->main_picture()->edit_rate (); + auto const frac = i->main_picture()->edit_rate (); float const fr = float(frac.numerator) / frac.denominator; if (!_video_frame_rate) { _video_frame_rate = fr; @@ -137,7 +126,7 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) } _has_video = true; - shared_ptr asset = i->main_picture()->asset (); + auto asset = i->main_picture()->asset(); if (!_video_size) { _video_size = asset->size (); } else if (_video_size.get() != asset->size ()) { @@ -155,7 +144,7 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) } _has_audio = true; - shared_ptr asset = i->main_sound()->asset (); + auto asset = i->main_sound()->asset(); if (!_audio_channels) { _audio_channels = asset->channels (); @@ -179,17 +168,17 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) return; } - _text_count[TEXT_OPEN_SUBTITLE] = 1; + _text_count[static_cast(TextType::OPEN_SUBTITLE)] = 1; } - BOOST_FOREACH (shared_ptr j, i->closed_captions()) { + 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; } - _text_count[TEXT_CLOSED_CAPTION]++; + _text_count[static_cast(TextType::CLOSED_CAPTION)]++; _dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text(), j->language().get_value_or(_("Unknown")))); } @@ -220,33 +209,52 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) } } - _encrypted = cpl->encrypted (); + _encrypted = cpl->any_encrypted (); _kdm_valid = true; - /* Check that we can read the first picture, sound and subtitle frames of each reel */ + /* Check first that anything encrypted has a key. We must do this, as if we try to + * read encrypted data with asdcplib without even offering a key it will just return + * the encrypted data. Secondly, check that we can read the first thing from each + * asset in each reel. This checks that when we do have a key it's the right one. + */ try { - BOOST_FOREACH (shared_ptr i, cpl->reels()) { - shared_ptr pic = i->main_picture()->asset (); - shared_ptr mono = dynamic_pointer_cast (pic); - shared_ptr stereo = dynamic_pointer_cast (pic); + for (auto i: cpl->reels()) { + auto pic = i->main_picture()->asset(); + if (pic->encrypted() && !pic->key()) { + _kdm_valid = false; + } + auto mono = dynamic_pointer_cast(pic); + auto stereo = dynamic_pointer_cast(pic); if (mono) { mono->start_read()->get_frame(0)->xyz_image (); } else { - stereo->start_read()->get_frame(0)->xyz_image (dcp::EYE_LEFT); + stereo->start_read()->get_frame(0)->xyz_image(dcp::Eye::LEFT); } if (i->main_sound()) { - shared_ptr sound = i->main_sound()->asset (); + auto sound = i->main_sound()->asset (); + if (sound->encrypted() && !sound->key()) { + _kdm_valid = false; + } i->main_sound()->asset()->start_read()->get_frame(0); } if (i->main_subtitle()) { - i->main_subtitle()->asset()->subtitles (); + auto sub = i->main_subtitle()->asset(); + auto mxf_sub = dynamic_pointer_cast(sub); + if (mxf_sub && mxf_sub->encrypted() && !mxf_sub->key()) { + _kdm_valid = false; + } + sub->subtitles (); } if (i->atmos()) { - i->atmos()->asset()->start_read()->get_frame(0); + auto atmos = i->atmos()->asset(); + if (atmos->encrypted() && !atmos->key()) { + _kdm_valid = false; + } + atmos->start_read()->get_frame(0); } } } catch (dcp::ReadError& e) { @@ -259,8 +267,10 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) _standard = cpl->standard().get(); _three_d = !cpl->reels().empty() && cpl->reels().front()->main_picture() && dynamic_pointer_cast (cpl->reels().front()->main_picture()->asset()); - _ratings = list_to_vector (cpl->ratings()); - _content_version = cpl->content_version_label_text (); + _ratings = cpl->ratings(); + for (auto i: cpl->content_versions()) { + _content_versions.push_back (i.label_text); + } _cpl = cpl->id (); }