From d5e7b00770b2b3c536f784b650cb980c694e7493 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Mar 2019 21:31:37 +0000 Subject: Fix referencing of trimmed multi-reel DCPs (#1495). --- test/vf_test.cc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'test/vf_test.cc') diff --git a/test/vf_test.cc b/test/vf_test.cc index 540e8da88..b36cc6567 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Carl Hetherington + Copyright (C) 2015-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -29,6 +29,8 @@ #include "lib/content_factory.h" #include "lib/dcp_content_type.h" #include "lib/video_content.h" +#include "lib/referenced_reel_asset.h" +#include "lib/player.h" #include "test.h" #include #include @@ -36,6 +38,7 @@ #include #include #include +#include using std::list; using std::string; @@ -283,4 +286,18 @@ BOOST_AUTO_TEST_CASE (vf_test5) dcp->set_trim_end (ContentTime::from_seconds(15)); vf->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); + + /* Check that the selected reel assets are right */ + shared_ptr player (new Player(vf, vf->playlist())); + list a = player->get_reel_assets(); + BOOST_REQUIRE_EQUAL (a.size(), 4); + list::const_iterator i = a.begin(); + BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000))); + ++i; + BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000))); + ++i; + BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(960000), DCPTime(1440000))); + ++i; + BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(960000), DCPTime(1440000))); + ++i; } -- cgit v1.2.3