From: Carl Hetherington Date: Wed, 6 Mar 2024 00:17:05 +0000 (+0100) Subject: Offer has_non_zero_entry_point() from DCPExaminer. X-Git-Tag: v2.17.13~6 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=4d2418d26ea16946931dc2024cc7afd4519fc9b9;p=dcpomatic.git Offer has_non_zero_entry_point() from DCPExaminer. --- diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index 22e9f9b50..3515f34c2 100644 --- a/src/lib/dcp_examiner.cc +++ b/src/lib/dcp_examiner.cc @@ -196,6 +196,9 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) } if (auto sub = reel->main_subtitle()) { + if (sub->entry_point().get_value_or(0) != 0) { + _has_non_zero_entry_point[TextType::OPEN_SUBTITLE] = true; + } if (!sub->asset_ref().resolved()) { LOG_GENERAL("Main subtitle %1 of reel %2 is missing", sub->id(), reel->id()); _needs_assets = true; @@ -225,6 +228,9 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) } for (auto ccap: reel->closed_captions()) { + if (ccap->entry_point().get_value_or(0) != 0) { + _has_non_zero_entry_point[TextType::CLOSED_CAPTION] = true; + } if (!ccap->asset_ref().resolved()) { LOG_GENERAL("Closed caption %1 of reel %2 is missing", ccap->id(), reel->id()); _needs_assets = true; diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h index 04fa31ea4..425552632 100644 --- a/src/lib/dcp_examiner.h +++ b/src/lib/dcp_examiner.h @@ -171,6 +171,10 @@ public: return _atmos_edit_rate; } + EnumIndexedVector has_non_zero_entry_point() const { + return _has_non_zero_entry_point; + } + void add_fonts(std::shared_ptr content); private: @@ -206,6 +210,7 @@ private: bool _has_atmos = false; Frame _atmos_length = 0; dcp::Fraction _atmos_edit_rate; + EnumIndexedVector _has_non_zero_entry_point; struct Font {