X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.cc;h=536c9ec1ab81885a9c71f0ecfc332245a1845193;hb=b168d211622f94a5240c945c1df03b0bed48d3bc;hp=5de8c89050caf391ed57848e64d433ed9414f7e9;hpb=0f9f004c50a8bea6b87d5a1636f95f67066e5187;p=dcpomatic.git diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index 5de8c8905..536c9ec1a 100644 --- a/src/lib/dcp_examiner.cc +++ b/src/lib/dcp_examiner.cc @@ -63,11 +63,7 @@ using boost::optional; DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) { - shared_ptr cpl; - - for (int i = 0; i < static_cast(TextType::COUNT); ++i) { - _text_count[i] = 0; - } + shared_ptr selected_cpl; auto cpls = dcp::find_and_resolve_cpls (content->directories(), tolerant); @@ -77,47 +73,47 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) if (iter == cpls.end()) { throw CPLNotFoundError(content->cpl().get()); } - cpl = *iter; + selected_cpl = *iter; } else { /* Choose the CPL with the fewest unsatisfied references */ int least_unsatisfied = INT_MAX; - for (auto i: cpls) { + for (auto cpl: cpls) { int unsatisfied = 0; - for (auto j: i->reels()) { - if (j->main_picture() && !j->main_picture()->asset_ref().resolved()) { + for (auto reel: cpl->reels()) { + if (reel->main_picture() && !reel->main_picture()->asset_ref().resolved()) { ++unsatisfied; } - if (j->main_sound() && !j->main_sound()->asset_ref().resolved()) { + if (reel->main_sound() && !reel->main_sound()->asset_ref().resolved()) { ++unsatisfied; } - if (j->main_subtitle() && !j->main_subtitle()->asset_ref().resolved()) { + if (reel->main_subtitle() && !reel->main_subtitle()->asset_ref().resolved()) { ++unsatisfied; } - if (j->atmos() && !j->atmos()->asset_ref().resolved()) { + if (reel->atmos() && !reel->atmos()->asset_ref().resolved()) { ++unsatisfied; } } if (unsatisfied < least_unsatisfied) { least_unsatisfied = unsatisfied; - cpl = i; + selected_cpl = cpl; } } } - if (!cpl) { + if (!selected_cpl) { throw DCPError ("No CPLs found in DCP"); } if (content->kdm()) { - cpl->add (decrypt_kdm_with_helpful_error(content->kdm().get())); + selected_cpl->add(decrypt_kdm_with_helpful_error(content->kdm().get())); } - _cpl = cpl->id (); - _name = cpl->content_title_text (); - _content_kind = cpl->content_kind (); + _cpl = selected_cpl->id(); + _name = selected_cpl->content_title_text(); + _content_kind = selected_cpl->content_kind(); LOG_GENERAL ("Selected CPL %1", _cpl); @@ -130,23 +126,23 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) return boost::none; }; - LOG_GENERAL ("Looking at %1 reels", cpl->reels().size()); + LOG_GENERAL("Looking at %1 reels", selected_cpl->reels().size()); - for (auto i: cpl->reels()) { - LOG_GENERAL ("Reel %1", i->id()); + for (auto reel: selected_cpl->reels()) { + LOG_GENERAL("Reel %1", reel->id()); vector> reel_fonts; - if (i->main_picture ()) { - if (!i->main_picture()->asset_ref().resolved()) { + if (reel->main_picture()) { + if (!reel->main_picture()->asset_ref().resolved()) { /* We are missing this asset so we can't continue; examination will be repeated later */ _needs_assets = true; - LOG_GENERAL ("Main picture %1 of reel %2 is missing", i->main_picture()->id(), i->id()); + LOG_GENERAL("Main picture %1 of reel %2 is missing", reel->main_picture()->id(), reel->id()); return; } - LOG_GENERAL ("Main picture %1 of reel %2 found", i->main_picture()->id(), i->id()); + LOG_GENERAL("Main picture %1 of reel %2 found", reel->main_picture()->id(), reel->id()); - auto const frac = i->main_picture()->edit_rate (); + auto const frac = reel->main_picture()->edit_rate(); float const fr = float(frac.numerator) / frac.denominator; if (!_video_frame_rate) { _video_frame_rate = fr; @@ -155,28 +151,28 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) } _has_video = true; - auto asset = i->main_picture()->asset(); + auto asset = reel->main_picture()->asset(); if (!_video_size) { _video_size = asset->size (); } else if (_video_size.get() != asset->size ()) { throw DCPError (_("Mismatched video sizes in DCP")); } - _video_length += i->main_picture()->actual_duration(); + _video_length += reel->main_picture()->actual_duration(); } - if (i->main_sound ()) { - if (!i->main_sound()->asset_ref().resolved()) { + if (reel->main_sound()) { + if (!reel->main_sound()->asset_ref().resolved()) { /* We are missing this asset so we can't continue; examination will be repeated later */ _needs_assets = true; - LOG_GENERAL ("Main sound %1 of reel %2 is missing", i->main_sound()->id(), i->id()); + LOG_GENERAL("Main sound %1 of reel %2 is missing", reel->main_sound()->id(), reel->id()); return; } - LOG_GENERAL ("Main sound %1 of reel %2 found", i->main_sound()->id(), i->id()); + LOG_GENERAL("Main sound %1 of reel %2 found", reel->main_sound()->id(), reel->id()); _has_audio = true; - auto asset = i->main_sound()->asset(); + auto asset = reel->main_sound()->asset(); if (!_audio_channels) { _audio_channels = asset->channels (); @@ -190,72 +186,76 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) throw DCPError (_("Mismatched audio sample rates in DCP")); } - _audio_length += i->main_sound()->actual_duration(); + _audio_length += reel->main_sound()->actual_duration(); _audio_language = try_to_parse_language (asset->language()); } - if (i->main_subtitle ()) { - if (!i->main_subtitle()->asset_ref().resolved()) { + if (reel->main_subtitle()) { + if (!reel->main_subtitle()->asset_ref().resolved()) { /* We are missing this asset so we can't continue; examination will be repeated later */ _needs_assets = true; - LOG_GENERAL ("Main subtitle %1 of reel %2 is missing", i->main_subtitle()->id(), i->id()); + LOG_GENERAL("Main subtitle %1 of reel %2 is missing", reel->main_subtitle()->id(), reel->id()); return; } - LOG_GENERAL ("Main subtitle %1 of reel %2 found", i->main_subtitle()->id(), i->id()); + LOG_GENERAL("Main subtitle %1 of reel %2 found", reel->main_subtitle()->id(), reel->id()); - _text_count[static_cast(TextType::OPEN_SUBTITLE)] = 1; - _open_subtitle_language = try_to_parse_language (i->main_subtitle()->language()); + _text_count[TextType::OPEN_SUBTITLE] = 1; + _open_subtitle_language = try_to_parse_language(reel->main_subtitle()->language()); - for (auto const& font: i->main_subtitle()->asset()->font_data()) { + for (auto const& font: reel->main_subtitle()->asset()->font_data()) { reel_fonts.push_back(make_shared(font.first, font.second)); } } - for (auto j: i->closed_captions()) { - if (!j->asset_ref().resolved()) { + for (auto ccap: reel->closed_captions()) { + if (!ccap->asset_ref().resolved()) { /* We are missing this asset so we can't continue; examination will be repeated later */ _needs_assets = true; - LOG_GENERAL ("Closed caption %1 of reel %2 is missing", j->id(), i->id()); + LOG_GENERAL("Closed caption %1 of reel %2 is missing", ccap->id(), reel->id()); return; } - LOG_GENERAL ("Closed caption %1 of reel %2 found", j->id(), i->id()); + LOG_GENERAL("Closed caption %1 of reel %2 found", ccap->id(), reel->id()); - _text_count[static_cast(TextType::CLOSED_CAPTION)]++; - _dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text().get_value_or(""), try_to_parse_language(j->language()))); + _text_count[TextType::CLOSED_CAPTION]++; + _dcp_text_tracks.push_back(DCPTextTrack(ccap->annotation_text().get_value_or(""), try_to_parse_language(ccap->language()))); } - if (i->main_markers ()) { - auto rm = i->main_markers()->get(); + if (reel->main_markers ()) { + auto rm = reel->main_markers()->get(); _markers.insert (rm.begin(), rm.end()); } - if (i->atmos()) { + if (reel->atmos()) { _has_atmos = true; - _atmos_length += i->atmos()->actual_duration(); + _atmos_length += reel->atmos()->actual_duration(); if (_atmos_edit_rate != dcp::Fraction()) { - DCPOMATIC_ASSERT (i->atmos()->edit_rate() == _atmos_edit_rate); + DCPOMATIC_ASSERT(reel->atmos()->edit_rate() == _atmos_edit_rate); } - _atmos_edit_rate = i->atmos()->edit_rate(); + _atmos_edit_rate = reel->atmos()->edit_rate(); + } + + if (reel->main_picture()) { + _reel_lengths.push_back(reel->main_picture()->actual_duration()); + } else if (reel->main_sound()) { + _reel_lengths.push_back(reel->main_sound()->actual_duration()); + } else if (reel->main_subtitle()) { + _reel_lengths.push_back(reel->main_subtitle()->actual_duration()); + } else if (!reel->closed_captions().empty()) { + _reel_lengths.push_back(reel->closed_captions().front()->actual_duration()); + } else if (!reel->atmos()) { + _reel_lengths.push_back(reel->atmos()->actual_duration()); } - if (i->main_picture()) { - _reel_lengths.push_back (i->main_picture()->actual_duration()); - } else if (i->main_sound()) { - _reel_lengths.push_back (i->main_sound()->actual_duration()); - } else if (i->main_subtitle()) { - _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()); + if (reel_fonts.empty()) { + reel_fonts.push_back(make_shared("")); } _fonts.push_back(reel_fonts); } - _encrypted = cpl->any_encrypted (); + _encrypted = selected_cpl->any_encrypted(); _kdm_valid = true; LOG_GENERAL_NC ("Check that everything encrypted has a key"); @@ -266,7 +266,7 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) * asset in each reel. This checks that when we do have a key it's the right one. */ try { - for (auto i: cpl->reels()) { + for (auto i: selected_cpl->reels()) { LOG_GENERAL ("Reel %1", i->id()); auto pic = i->main_picture()->asset(); if (pic->encrypted() && !pic->key()) { @@ -330,13 +330,13 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) LOG_GENERAL ("KDM is invalid: %1", e.what()); } - _standard = cpl->standard(); - _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); + _standard = selected_cpl->standard(); + _three_d = !selected_cpl->reels().empty() && selected_cpl->reels().front()->main_picture() && + dynamic_pointer_cast(selected_cpl->reels().front()->main_picture()->asset()); + _ratings = selected_cpl->ratings(); + for (auto version: selected_cpl->content_versions()) { + _content_versions.push_back(version.label_text); } - _cpl = cpl->id (); + _cpl = selected_cpl->id(); }