diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-31 21:45:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-31 22:39:50 +0100 |
| commit | 122bea7f0e08e07dcdaccd51751a9c83504f4c04 (patch) | |
| tree | 76fda35f6ffd5bcfad032bf32d07c498b084b734 /test/vf_test.cc | |
| parent | b950f49fa893e71545eaf9c0abe8a453d42a4340 (diff) | |
Make separate reels for parts of the timeline with no video when
we are in REEL_TYPE_BY_VIDEO_CONTENT mode. This fixes VF creation
with gaps. Also the implementation of Film::reels() is cleaner now.
Diffstat (limited to 'test/vf_test.cc')
| -rw-r--r-- | test/vf_test.cc | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/test/vf_test.cc b/test/vf_test.cc index 307d26ea6..915ca5c8c 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -337,3 +337,39 @@ BOOST_AUTO_TEST_CASE (vf_test6) vf->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); } + +/** Test bug #1643 (the second part; referring fails if there are gaps) */ +BOOST_AUTO_TEST_CASE (vf_test7) +{ + /* First OV */ + shared_ptr<Film> ov1 = new_test_film2 ("vf_test7_ov1"); + ov1->set_video_frame_rate (24); + ov1->examine_and_add_content (content_factory("test/data/flat_red.png").front()); + BOOST_REQUIRE (!wait_for_jobs()); + ov1->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Second OV */ + shared_ptr<Film> ov2 = new_test_film2 ("vf_test7_ov2"); + ov2->set_video_frame_rate (24); + ov2->examine_and_add_content (content_factory("test/data/flat_red.png").front()); + BOOST_REQUIRE (!wait_for_jobs()); + ov2->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* VF */ + shared_ptr<Film> vf = new_test_film2 ("vf_test7_vf"); + shared_ptr<DCPContent> ov1_dcp (new DCPContent(ov1->dir(ov1->dcp_name()))); + vf->examine_and_add_content (ov1_dcp); + shared_ptr<DCPContent> ov2_dcp (new DCPContent(ov1->dir(ov1->dcp_name()))); + vf->examine_and_add_content (ov2_dcp); + BOOST_REQUIRE (!wait_for_jobs()); + vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + ov1_dcp->set_reference_video (true); + ov2_dcp->set_reference_video (true); + ov1_dcp->set_position (vf, DCPTime::from_seconds(1)); + ov2_dcp->set_position (vf, DCPTime::from_seconds(20)); + vf->write_metadata (); + vf->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); +} |