Fix a load of stuff that wasn't being freed on close.

[dcpomatic.git] / test / threed_test.cc

diff --git a/test/threed_test.cc b/test/threed_test.cc
index bceb6700fe1d7bad834626dba3ea5569e1b73f1f..4fe91ebca3679f37616dd8d407e01cedb7949a5a 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -33,6 +33,7 @@
 #include "lib/film.h"
 #include "lib/job.h"
 #include "lib/job_manager.h"
+#include "lib/make_dcp.h"
 #include "lib/ratio.h"
 #include "lib/video_content.h"
 #include "test.h"
@@ -186,7 +187,7 @@ BOOST_AUTO_TEST_CASE (threed_test7)
        c->video->set_length (24);
 
        film->set_three_d (true);
-       film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE);
+       make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE);
        film->write_metadata ();
 
        auto jm = JobManager::instance ();
@@ -212,3 +213,45 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 
        JobManager::drop ();
 }
+
+
+/** Trigger a -114 error by trying to make a 3D DCP out of two files with slightly
+ *  different lengths.
+ */
+BOOST_AUTO_TEST_CASE (threed_test_separate_files_slightly_different_lengths)
+{
+       shared_ptr<Film> film = new_test_film2 ("threed_test3");
+       auto L = make_shared<FFmpegContent>("test/data/test.mp4");
+       film->examine_and_add_content (L);
+       auto R = make_shared<FFmpegContent>("test/data/test.mp4");
+       film->examine_and_add_content (R);
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
+       R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT);
+       R->set_trim_end (dcpomatic::ContentTime::from_frames(1, 24));
+
+       film->set_three_d (true);
+       make_and_verify_dcp (film);
+}
+
+
+/** Trigger a -114 error by trying to make a 3D DCP out of two files with very
+ *  different lengths.
+ */
+BOOST_AUTO_TEST_CASE (threed_test_separate_files_very_different_lengths)
+{
+       shared_ptr<Film> film = new_test_film2 ("threed_test3");
+       auto L = make_shared<FFmpegContent>("test/data/test.mp4");
+       film->examine_and_add_content (L);
+       auto R = make_shared<FFmpegContent>("test/data/test.mp4");
+       film->examine_and_add_content (R);
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
+       R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT);
+       R->set_trim_end (dcpomatic::ContentTime::from_seconds(1.5));
+
+       film->set_three_d (true);
+       make_and_verify_dcp (film);
+}