X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Freels_test.cc;h=bf40aa3a11d20fd5d6f64bff6b49faca578bd652;hp=15e386d59c29b679616443563882db3289794ec9;hb=83bda33c161b267ae35e474f0bfb16a1bb7ad281;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566 diff --git a/test/reels_test.cc b/test/reels_test.cc index 15e386d59..bf40aa3a1 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2016 Carl Hetherington + Copyright (C) 2015-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -35,10 +35,14 @@ #include "test.h" #include #include +#include using std::list; using std::cout; +using std::vector; +using std::string; using boost::shared_ptr; +using boost::function; using namespace dcpomatic; /** Test Film::reels() */ @@ -372,3 +376,192 @@ BOOST_AUTO_TEST_CASE (reels_test9) film2->make_dcp(); BOOST_REQUIRE(!wait_for_jobs()); } + +/** Another reels-related error; make_dcp() would raise a ProgrammingError + * in AudioBuffers::allocate due to an attempt to allocate a negatively-sized buffer. + * This was triggered by a VF where there are referenced audio reels followed by + * VF audio. When the VF audio arrives the Writer did not correctly skip over the + * referenced reels. + */ +BOOST_AUTO_TEST_CASE (reels_test10) +{ + /* Make the OV */ + shared_ptr ov = new_test_film2("reels_test10_ov"); + shared_ptr A(new FFmpegContent("test/data/flat_red.png")); + ov->examine_and_add_content (A); + BOOST_REQUIRE (!wait_for_jobs()); + A->video->set_length (5 * 24); + + shared_ptr B(new FFmpegContent("test/data/flat_red.png")); + ov->examine_and_add_content (B); + BOOST_REQUIRE (!wait_for_jobs()); + B->video->set_length (5 * 24); + + ov->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + ov->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + ov->write_metadata (); + + /* Now try to make the VF; this used to fail */ + shared_ptr vf = new_test_film2("reels_test10_vf"); + shared_ptr ov_dcp(new DCPContent(ov->dir(ov->dcp_name()))); + vf->examine_and_add_content (ov_dcp); + BOOST_REQUIRE (!wait_for_jobs()); + vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + ov_dcp->set_reference_video (true); + ov_dcp->set_reference_audio (true); + vf->examine_and_add_content (content_factory("test/data/15s.srt").front()); + BOOST_REQUIRE (!wait_for_jobs()); + + vf->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + vf->write_metadata (); +} + +/** Another reels error; REELTYPE_BY_VIDEO_CONTENT when the first content is not + * at time 0. + */ +BOOST_AUTO_TEST_CASE (reels_test11) +{ + shared_ptr film = new_test_film2 ("reels_test11"); + film->set_video_frame_rate (24); + shared_ptr A(new FFmpegContent("test/data/flat_red.png")); + film->examine_and_add_content (A); + BOOST_REQUIRE (!wait_for_jobs()); + A->video->set_length (240); + A->set_video_frame_rate (24); + A->set_position (film, DCPTime::from_seconds(1)); + film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + BOOST_CHECK_EQUAL (A->position().get(), DCPTime::from_seconds(1).get()); + BOOST_CHECK_EQUAL (A->end(film).get(), DCPTime::from_seconds(1 + 10).get()); + + list r = film->reels (); + BOOST_CHECK_EQUAL (r.size(), 2); + BOOST_CHECK_EQUAL (r.front().from.get(), 0); + BOOST_CHECK_EQUAL (r.front().to.get(), DCPTime::from_seconds(1).get()); + BOOST_CHECK_EQUAL (r.back().from.get(), DCPTime::from_seconds(1).get()); + BOOST_CHECK_EQUAL (r.back().to.get(), DCPTime::from_seconds(1 + 10).get()); +} + +/** For VFs to work right we have to make separate reels for empty bits between + * video content. + */ +BOOST_AUTO_TEST_CASE (reels_test12) +{ + shared_ptr film = new_test_film2 ("reels_test12"); + film->set_video_frame_rate (24); + film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + film->set_sequence (false); + + shared_ptr A(new FFmpegContent("test/data/flat_red.png")); + film->examine_and_add_content (A); + BOOST_REQUIRE (!wait_for_jobs()); + A->video->set_length (240); + A->set_video_frame_rate (24); + A->set_position (film, DCPTime::from_seconds(1)); + + shared_ptr B(new FFmpegContent("test/data/flat_red.png")); + film->examine_and_add_content (B); + BOOST_REQUIRE (!wait_for_jobs()); + B->video->set_length (120); + B->set_video_frame_rate (24); + B->set_position (film, DCPTime::from_seconds(14)); + + list r = film->reels (); + BOOST_REQUIRE_EQUAL (r.size(), 4); + list::const_iterator i = r.begin (); + + BOOST_CHECK_EQUAL (i->from.get(), 0); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_seconds(1).get()); + ++i; + BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_seconds(1).get()); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_seconds(11).get()); + ++i; + BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_seconds(11).get()); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_seconds(14).get()); + ++i; + BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_seconds(14).get()); + BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_seconds(19).get()); +} + +static void +no_op () +{ + +} + + +/** Using less than 1 second's worth of content should not result in a reel + * of less than 1 second's duration. + */ +BOOST_AUTO_TEST_CASE (reels_should_not_be_short1) +{ + shared_ptr film = new_test_film2 ("reels_should_not_be_short1"); + film->set_video_frame_rate (24); + + shared_ptr A(new FFmpegContent("test/data/flat_red.png")); + film->examine_and_add_content (A); + BOOST_REQUIRE (!wait_for_jobs()); + A->video->set_length (23); + + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + vector dirs; + dirs.push_back (film->dir(film->dcp_name(false))); + BOOST_REQUIRE (dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd).empty()); +} + +/** Leaving less than 1 second's gap between two pieces of content with + * REELTYPE_BY_VIDEO_CONTENT should not make a <1s reel. + */ +BOOST_AUTO_TEST_CASE (reels_should_not_be_short2) +{ + shared_ptr film = new_test_film2 ("reels_should_not_be_short2"); + film->set_video_frame_rate (24); + film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + + shared_ptr A(new FFmpegContent("test/data/flat_red.png")); + film->examine_and_add_content (A); + BOOST_REQUIRE (!wait_for_jobs()); + A->video->set_length (240); + + shared_ptr B(new FFmpegContent("test/data/flat_red.png")); + film->examine_and_add_content (B); + BOOST_REQUIRE (!wait_for_jobs()); + B->video->set_length (240); + B->set_position (film, DCPTime::from_seconds(10.2)); + + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + vector dirs; + dirs.push_back (film->dir(film->dcp_name(false))); + BOOST_REQUIRE (dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd).empty()); +} + +/** Setting REELTYPE_BY_LENGTH and using a small length value should not make + * <1s reels. + */ +BOOST_AUTO_TEST_CASE (reels_should_not_be_short3) +{ + shared_ptr film = new_test_film2 ("reels_should_not_be_short3"); + film->set_video_frame_rate (24); + film->set_reel_type (REELTYPE_BY_LENGTH); + film->set_reel_length (1024 * 1024 * 10); + + shared_ptr A(new FFmpegContent("test/data/flat_red.png")); + film->examine_and_add_content (A); + BOOST_REQUIRE (!wait_for_jobs()); + A->video->set_length (240); + + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + vector dirs; + dirs.push_back (film->dir(film->dcp_name(false))); + BOOST_REQUIRE (dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd).empty()); +} +