From 6e49be4baede66ce5f89c45fffafb6bdfff95401 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 27 Aug 2023 00:17:58 +0200 Subject: Fix refusal to reference overlapping but different text content (#2599). --- test/vf_test.cc | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'test') diff --git a/test/vf_test.cc b/test/vf_test.cc index 3705635c2..ecd615d98 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -31,6 +31,7 @@ #include "lib/ffmpeg_content.h" #include "lib/film.h" #include "lib/player.h" +#include "lib/text_content.h" #include "lib/referenced_reel_asset.h" #include "lib/video_content.h" #include "test.h" @@ -397,3 +398,28 @@ BOOST_AUTO_TEST_CASE (test_vf_with_trimmed_multi_reel_dcp) make_and_verify_dcp (vf, { dcp::VerificationNote::Code::EXTERNAL_ASSET }); } + +/** Test bug #2599: unable to reference open subtitles in an OV when creating a VF that adds closed captions */ +BOOST_AUTO_TEST_CASE(test_referencing_ov_with_subs_when_adding_ccaps) +{ + string const name("test_referencing_ov_with_subs_when_adding_ccaps"); + auto subs = content_factory("test/data/15s.srt"); + auto ov = new_test_film2(name + "_ov", subs); + make_and_verify_dcp( + ov, + { + dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, + dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME, + dcp::VerificationNote::Code::MISSING_CPL_METADATA + }); + + auto ccaps = content_factory("test/data/15s.srt")[0]; + auto ov_dcp = make_shared(ov->dir(ov->dcp_name(false))); + auto vf = new_test_film2(name + "_vf", { ov_dcp, ccaps }); + ccaps->text[0]->set_type(TextType::CLOSED_CAPTION); + + string why_not; + BOOST_CHECK(ov_dcp->can_reference_text(vf, TextType::OPEN_SUBTITLE, why_not)); + std::cout << why_not << "\n"; +} + -- cgit v1.2.3