X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvf_test.cc;h=ca987b22d4ce4cc91d51bf41b5ad7b86ff4beb5a;hb=HEAD;hp=4db48dd60071c83b5838323169eb4c16e361a26f;hpb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;p=dcpomatic.git

diff --git a/test/vf_test.cc b/test/vf_test.cc
index 4db48dd60..ca987b22d 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -25,29 +25,40 @@
  */
 
 
-#include "lib/film.h"
-#include "lib/dcp_content.h"
-#include "lib/ffmpeg_content.h"
 #include "lib/content_factory.h"
+#include "lib/dcp_content.h"
 #include "lib/dcp_content_type.h"
-#include "lib/video_content.h"
-#include "lib/referenced_reel_asset.h"
+#include "lib/examine_content_job.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
+#include "lib/job_manager.h"
+#include "lib/make_dcp.h"
 #include "lib/player.h"
+#include "lib/ratio.h"
+#include "lib/text_content.h"
+#include "lib/referenced_reel_asset.h"
+#include "lib/video_content.h"
 #include "test.h"
 #include <dcp/cpl.h>
+#include <dcp/mono_picture_asset.h>
+#include <dcp/picture_asset_writer.h>
 #include <dcp/reel.h>
-#include <dcp/reel_picture_asset.h>
+#include <dcp/reel_mono_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
+#include <dcp/reel_smpte_subtitle_asset.h>
+#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/subtitle_string.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
 
-using std::list;
-using std::string;
 using std::cout;
-using std::shared_ptr;
-using std::make_shared;
 using std::dynamic_pointer_cast;
+using std::list;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using std::vector;
 using namespace dcpomatic;
 
 
@@ -62,6 +73,7 @@ BOOST_AUTO_TEST_CASE (vf_test1)
 
 	/* Multi-reel DCP can't be referenced if we are using a single reel for the project */
 	film->set_reel_type (ReelType::SINGLE);
+	film->set_audio_channels(16);
 	string why_not;
 	BOOST_CHECK (!dcp->can_reference_video(film, why_not));
 	BOOST_CHECK (!dcp->can_reference_audio(film, why_not));
@@ -102,11 +114,11 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 	auto ov = new_test_film ("vf_test2_ov");
 	ov->set_dcp_content_type (DCPContentType::from_isdcf_name("TST"));
 	ov->set_name ("vf_test2_ov");
-	auto video = content_factory("test/data/flat_red.png").front();
+	auto video = content_factory("test/data/flat_red.png")[0];
 	ov->examine_and_add_content (video);
 	BOOST_REQUIRE (!wait_for_jobs());
 	video->video->set_length (24 * 5);
-	auto audio = content_factory("test/data/white.wav").front();
+	auto audio = content_factory("test/data/white.wav")[0];
 	ov->examine_and_add_content (audio);
 	BOOST_REQUIRE (!wait_for_jobs());
 	make_and_verify_dcp (ov);
@@ -121,7 +133,7 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 	BOOST_REQUIRE (!wait_for_jobs());
 	dcp->set_reference_video (true);
 	dcp->set_reference_audio (true);
-	auto sub = content_factory("test/data/subrip4.srt").front();
+	auto sub = content_factory("test/data/subrip4.srt")[0];
 	vf->examine_and_add_content (sub);
 	BOOST_REQUIRE (!wait_for_jobs());
 	make_and_verify_dcp (
@@ -131,7 +143,9 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION
-		});
+		},
+		false
+		);
 
 	dcp::DCP ov_c (ov->dir(ov->dcp_name()));
 	ov_c.read ();
@@ -164,11 +178,11 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 	auto ov = new_test_film ("vf_test3_ov");
 	ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	ov->set_name ("vf_test3_ov");
-	auto video = content_factory("test/data/flat_red.png").front();
+	auto video = content_factory("test/data/flat_red.png")[0];
 	ov->examine_and_add_content (video);
 	BOOST_REQUIRE (!wait_for_jobs());
 	video->video->set_length (24 * 5);
-	auto audio = content_factory("test/data/white.wav").front();
+	auto audio = content_factory("test/data/white.wav")[0];
 	ov->examine_and_add_content (audio);
 	BOOST_REQUIRE (!wait_for_jobs());
 	make_and_verify_dcp (ov);
@@ -180,13 +194,13 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 	vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	auto dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
 	BOOST_REQUIRE (dcp);
-	dcp->set_trim_start (ContentTime::from_seconds (1));
+	dcp->set_trim_start(vf, ContentTime::from_seconds (1));
 	dcp->set_trim_end (ContentTime::from_seconds (1));
 	vf->examine_and_add_content (dcp);
 	BOOST_REQUIRE (!wait_for_jobs());
 	dcp->set_reference_video (true);
 	dcp->set_reference_audio (true);
-	make_and_verify_dcp (vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET});
+	make_and_verify_dcp(vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false);
 
 	dcp::DCP vf_c (vf->dir(vf->dcp_name()));
 	vf_c.read ();
@@ -208,11 +222,11 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 	auto ov = new_test_film ("vf_test4_ov");
 	ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	ov->set_name ("vf_test4_ov");
-	auto video = content_factory("test/data/flat_red.png").front();
+	auto video = content_factory("test/data/flat_red.png")[0];
 	ov->examine_and_add_content (video);
 	BOOST_REQUIRE (!wait_for_jobs());
 	video->video->set_length (24 * 5);
-	auto audio = content_factory("test/data/white.wav").front();
+	auto audio = content_factory("test/data/white.wav")[0];
 	ov->examine_and_add_content (audio);
 	BOOST_REQUIRE (!wait_for_jobs());
 	make_and_verify_dcp (ov);
@@ -230,12 +244,12 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 	dcp->set_position(vf, DCPTime::from_seconds(10));
 	dcp->set_reference_video (true);
 	dcp->set_reference_audio (true);
-	auto more_video = content_factory("test/data/flat_red.png").front();
+	auto more_video = content_factory("test/data/flat_red.png")[0];
 	vf->examine_and_add_content (more_video);
 	BOOST_REQUIRE (!wait_for_jobs());
 	more_video->set_position (vf, DCPTime());
 	vf->write_metadata ();
-	make_and_verify_dcp (vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET});
+	make_and_verify_dcp(vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false);
 
 	dcp::DCP ov_c (ov->dir(ov->dcp_name()));
 	ov_c.read ();
@@ -266,7 +280,7 @@ BOOST_AUTO_TEST_CASE (vf_test5)
 	ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	ov->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	for (int i = 0; i < 3; ++i) {
-		auto video = content_factory("test/data/flat_red.png").front();
+		auto video = content_factory("test/data/flat_red.png")[0];
 		ov->examine_and_add_content (video);
 		BOOST_REQUIRE (!wait_for_jobs());
 		video->video->set_length (24 * 10);
@@ -288,11 +302,10 @@ BOOST_AUTO_TEST_CASE (vf_test5)
 	dcp->set_reference_video (true);
 	dcp->set_reference_audio (true);
 	dcp->set_trim_end (ContentTime::from_seconds(15));
-	make_and_verify_dcp (vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET});
+	make_and_verify_dcp(vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false);
 
 	/* Check that the selected reel assets are right */
-	auto player = make_shared<Player>(vf, Image::Alignment::COMPACT);
-	auto a = player->get_reel_assets();
+	auto a = get_referenced_reel_assets(vf, vf->playlist());
 	BOOST_REQUIRE_EQUAL (a.size(), 4U);
 	auto i = a.begin();
 	BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000)));
@@ -313,7 +326,7 @@ BOOST_AUTO_TEST_CASE (vf_test6)
 	auto ov = new_test_film ("vf_test6_ov");
 	ov->set_dcp_content_type (DCPContentType::from_isdcf_name("TST"));
 	ov->set_reel_type (ReelType::BY_VIDEO_CONTENT);
-	auto video = content_factory("test/data/flat_red.png").front();
+	auto video = content_factory("test/data/flat_red.png")[0];
 	ov->examine_and_add_content (video);
 	BOOST_REQUIRE (!wait_for_jobs());
 	video->video->set_length (24 * 10);
@@ -331,7 +344,7 @@ BOOST_AUTO_TEST_CASE (vf_test6)
 	dcp->set_reference_video (true);
 	dcp->set_reference_audio (true);
 
-	auto sub = content_factory("test/data/15s.srt").front();
+	auto sub = content_factory("test/data/15s.srt")[0];
 	vf->examine_and_add_content (sub);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -341,7 +354,9 @@ BOOST_AUTO_TEST_CASE (vf_test6)
 			dcp::VerificationNote::Code::EXTERNAL_ASSET,
 			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
-		});
+		},
+		false
+		);
 }
 
 
@@ -349,12 +364,12 @@ BOOST_AUTO_TEST_CASE (vf_test6)
 BOOST_AUTO_TEST_CASE (vf_test7)
 {
 	/* First OV */
-	auto ov1 = new_test_film2 ("vf_test7_ov1", {content_factory("test/data/flat_red.png").front()});
+	auto ov1 = new_test_film2 ("vf_test7_ov1", {content_factory("test/data/flat_red.png")[0]});
 	ov1->set_video_frame_rate (24);
 	make_and_verify_dcp (ov1);
 
 	/* Second OV */
-	auto ov2 = new_test_film2 ("vf_test7_ov2", {content_factory("test/data/flat_red.png").front()});
+	auto ov2 = new_test_film2 ("vf_test7_ov2", {content_factory("test/data/flat_red.png")[0]});
 	ov2->set_video_frame_rate (24);
 	make_and_verify_dcp (ov2);
 
@@ -370,3 +385,200 @@ BOOST_AUTO_TEST_CASE (vf_test7)
 	vf->write_metadata ();
 	make_and_verify_dcp (vf);
 }
+
+
+/** Test bug #2116 */
+BOOST_AUTO_TEST_CASE (test_vf_with_trimmed_multi_reel_dcp)
+{
+	/* Make an OV with 3 reels */
+	std::vector<std::shared_ptr<Content>> ov_content;
+	for (int i = 0; i < 3; ++i) {
+		auto c = content_factory("test/data/flat_red.png")[0];
+		c->video->set_length(240);
+		ov_content.push_back(c);
+	}
+	auto ov = new_test_film2 ("test_vf_with_trimmed_multi_reel_dcp_ov", ov_content);
+	ov->set_reel_type(ReelType::BY_VIDEO_CONTENT);
+	make_and_verify_dcp (ov);
+
+	/* Make a VF with a specific arrangement */
+	auto vf_image = content_factory("test/data/flat_red.png")[0];
+	auto vf_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
+	auto vf = new_test_film2 ("test_vf_with_trimmed_multi_reel_dcp_vf", { vf_image, vf_dcp });
+	vf->set_reel_type(ReelType::BY_VIDEO_CONTENT);
+	vf_dcp->set_reference_video(true);
+	vf_dcp->set_reference_audio(true);
+	vf_dcp->set_trim_start(vf, ContentTime::from_seconds(10));
+	vf_dcp->set_position(vf, DCPTime::from_seconds(10));
+	make_and_verify_dcp(vf, { dcp::VerificationNote::Code::EXTERNAL_ASSET }, false);
+}
+
+
+/** 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<DCPContent>(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";
+}
+
+
+BOOST_AUTO_TEST_CASE(test_duplicate_font_id_in_vf)
+{
+	string const name("test_duplicate_font_id_in_vf");
+	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<DCPContent>(ov->dir(ov->dcp_name(false)));
+	auto vf = new_test_film2(name + "_vf", { ov_dcp, ccaps });
+	ov_dcp->set_reference_audio(true);
+	ov_dcp->set_reference_video(true);
+	ov_dcp->text[0]->set_use(true);
+	ccaps->text[0]->set_type(TextType::CLOSED_CAPTION);
+	string why_not;
+	BOOST_CHECK_MESSAGE(ov_dcp->can_reference_text(vf, TextType::OPEN_SUBTITLE, why_not), why_not);
+	ov_dcp->set_reference_text(TextType::OPEN_SUBTITLE, true);
+	vf->write_metadata();
+	make_dcp(vf, TranscodeJob::ChangedBehaviour::IGNORE);
+	BOOST_REQUIRE(!wait_for_jobs());
+
+	auto vf_dcp = make_shared<DCPContent>(vf->dir(vf->dcp_name(false)));
+
+	auto test = new_test_film2(name + "_test", { vf_dcp });
+	vf_dcp->add_ov(ov->dir(ov->dcp_name(false)));
+	JobManager::instance()->add(make_shared<ExamineContentJob>(test, vf_dcp));
+	BOOST_CHECK(!wait_for_jobs());
+
+	make_and_verify_dcp(
+		test,
+		{
+			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA,
+		});
+}
+
+
+BOOST_AUTO_TEST_CASE(test_referencing_ov_with_missing_subtitle_in_some_reels)
+{
+	auto const path = boost::filesystem::path("build/test/test_referencing_ov_with_missing_subtitle_in_some_reels");
+	boost::filesystem::remove_all(path);
+
+	boost::filesystem::create_directories(path / "ov");
+	dcp::DCP ov(path / "ov");
+
+	auto make_picture = [path](string filename) {
+		auto pic = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+		auto writer = pic->start_write(path / "ov" / filename, dcp::PictureAsset::Behaviour::MAKE_NEW);
+		auto frame = dcp::ArrayData("test/data/picture.j2c");
+		for (int i = 0; i < 240; ++i) {
+			writer->write(frame);
+		}
+		writer->finalize();
+		return pic;
+	};
+
+	auto pic1 = make_picture("pic1.mxf");
+	auto pic2 = make_picture("pic2.mxf");
+
+	auto sub1 = make_shared<dcp::SMPTESubtitleAsset>();
+
+	sub1->add(std::make_shared<dcp::SubtitleString>(
+		boost::optional<string>(), false, false, false, dcp::Colour(255, 255, 255),
+		42, 1, dcp::Time(0, 0, 5, 0, 24), dcp::Time(0, 0, 9, 0, 24),
+		0, dcp::HAlign::CENTER,
+		0, dcp::VAlign::CENTER,
+		0, dcp::Direction::LTR,
+		"Hello",
+		dcp::Effect::NONE, dcp::Colour(0, 0, 0),
+		dcp::Time{}, dcp::Time{},
+		0, vector<dcp::Ruby>{}
+		));
+	sub1->write(path / "ov" / "sub.mxf");
+
+	auto reel1_pic = make_shared<dcp::ReelMonoPictureAsset>(pic1, 0);
+	auto reel1_sub = make_shared<dcp::ReelSMPTESubtitleAsset>(sub1, dcp::Fraction(24, 1), 240, 0);
+
+	auto reel2_pic = make_shared<dcp::ReelMonoPictureAsset>(pic1, 0);
+
+	auto reel1 = make_shared<dcp::Reel>(reel1_pic, shared_ptr<dcp::ReelSoundAsset>(), reel1_sub);
+	auto reel2 = make_shared<dcp::Reel>(reel2_pic);
+
+	auto cpl = make_shared<dcp::CPL>("Test CPL", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE);
+	cpl->add(reel1);
+	cpl->add(reel2);
+
+	ov.add(cpl);
+	ov.write_xml();
+
+	auto dcp_ov = make_shared<DCPContent>(path / "ov");
+	auto vf = make_shared<Film>(path / "vf");
+	vf->set_dcp_content_type(DCPContentType::from_isdcf_name("TST"));
+	vf->set_container(Ratio::from_id("185"));
+	vf->write_metadata();
+	vf->examine_and_add_content(dcp_ov);
+	BOOST_REQUIRE(!wait_for_jobs());
+	vf->set_reel_type(ReelType::BY_VIDEO_CONTENT);
+	dcp_ov->set_reference_video(true);
+	dcp_ov->set_reference_text(TextType::OPEN_SUBTITLE, true);
+
+	vf->write_metadata();
+	make_dcp(vf, TranscodeJob::ChangedBehaviour::IGNORE);
+	BOOST_REQUIRE(!wait_for_jobs());
+
+	vector<dcp::VerificationNote::Code> ignore = {
+		dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+		dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+		dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
+		dcp::VerificationNote::Code::EXTERNAL_ASSET,
+	};
+
+	verify_dcp(vf->dir(vf->dcp_name()), ignore);
+}
+
+
+/* Test bug #2703: a VF that refers to some OV subs does not get the correct subtitle language in the ISDCF name */
+BOOST_AUTO_TEST_CASE(ov_subs_in_vf_name)
+{
+	auto subs = content_factory("test/data/short.srt")[0];
+	auto ov = new_test_film2("ov_subs_in_vf_name_ov", { subs });
+	subs->only_text()->set_language(dcp::LanguageTag("de"));
+	make_and_verify_dcp(
+		ov,
+		{
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA
+		});
+
+	auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
+	auto vf = new_test_film2("ov_subs_in_vf_name_vf", { ov_dcp });
+	vf->set_name("foo");
+	ov_dcp->set_reference_text(TextType::OPEN_SUBTITLE, true);
+	vf->_isdcf_date = boost::gregorian::date(2023, boost::gregorian::Jan, 18);
+
+	BOOST_CHECK_EQUAL(vf->isdcf_name(false), "Foo_TST-1_F_XX-DE_51-HI-VI_2K_20230118_SMPTE_VF");
+}