X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=4fe91ebca3679f37616dd8d407e01cedb7949a5a;hb=924e7b3a078c6552fc55d6e1965d241292e9b48a;hp=f98464fb5810329d20a6a6903ed2b175bc4fb9b6;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index f98464fb5..4fe91ebca 100644
--- 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"
@@ -105,6 +106,11 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
+	ConfigRestorer cr;
+
+	/* Try to stop out-of-memory crashes on my laptop */
+	Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 4);
+
 	auto film = new_test_film2 ("threed_test4");
 	auto L = make_shared<FFmpegContent>(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov");
 	film->examine_and_add_content (L);
@@ -181,7 +187,7 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 	c->video->set_length (24);
 
 	film->set_three_d (true);
-	film->make_dcp ();
+	make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE);
 	film->write_metadata ();
 
 	auto jm = JobManager::instance ();
@@ -207,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);
+}