X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fverify.cc;h=620ee31d872718be1be86295766a3045d70eb413;hb=8305f28ea22a834cc4a9e4b324110b5ff4ba1bd1;hp=42ee192119b85280ada83512167a01aaa2a4805d;hpb=6a1a6e5462172fad159b39f0f73b1e81dc1848aa;p=libdcp.git diff --git a/src/verify.cc b/src/verify.cc index 42ee1921..620ee31d 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -715,9 +715,9 @@ verify_smpte_timed_text_asset ( } -/** Verify Interop subtitle-only stuff */ +/** Verify Interop subtitle / CCAP stuff */ void -verify_interop_subtitle_asset(shared_ptr asset, vector& notes) +verify_interop_text_asset(shared_ptr asset, vector& notes) { if (asset->subtitles().empty()) { notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_SUBTITLE, asset->id(), asset->file().get() }); @@ -806,7 +806,7 @@ verify_subtitle_asset ( auto interop = dynamic_pointer_cast(asset); if (interop) { - verify_interop_subtitle_asset(interop, notes); + verify_interop_text_asset(interop, notes); if (namespace_count(asset, "DCSubtitle") > 1) { notes.push_back({ VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id() }); } @@ -848,6 +848,11 @@ verify_closed_caption_asset ( notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISSED_CHECK_OF_ENCRYPTED}); } + auto interop = dynamic_pointer_cast(asset); + if (interop) { + verify_interop_text_asset(interop, notes); + } + auto smpte = dynamic_pointer_cast(asset); if (smpte) { verify_smpte_timed_text_asset (smpte, reel_asset_duration, notes);