X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=4fe91ebca3679f37616dd8d407e01cedb7949a5a;hb=9dbf21fd28991898e61020de0809497999282562;hp=cda278a59702506a654392aaf3c4d8b8897723fd;hpb=ea63ad9560757e56505551db3bf2e1c31be5c76c;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index cda278a59..4fe91ebca 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,21 +18,25 @@
 
 */
 
+
 /** @file  test/threed_test.cc
  *  @brief Create some 3D DCPs (without comparing the results to anything).
  *  @ingroup completedcp
  */
 
-#include "test.h"
-#include "lib/film.h"
-#include "lib/ratio.h"
+
 #include "lib/config.h"
+#include "lib/content_factory.h"
+#include "lib/cross.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/video_content.h"
-#include "lib/job_manager.h"
-#include "lib/cross.h"
+#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"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -102,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);
@@ -169,15 +178,16 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 	using boost::filesystem::path;
 
 	auto film = new_test_film2 ("threed_test7");
-	path const content_path = "test/data/red_24.mp4";
-	auto c = make_shared<FFmpegContent>(content_path);
+	path const content_path = "test/data/flat_red.png";
+	auto c = content_factory(content_path).front();
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	c->video->set_frame_type (VideoFrameType::THREE_D);
+	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 ();
@@ -203,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);
+}