X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fthreed_test.cc;h=f0ee13c9a0ea093a79556cf2b4dcda87c3515b5b;hp=a8d3f8a00f737d03fcecb941fc531b65ee41e462;hb=629359a2c3eb1ff37d9bc53e260b00700267e8db;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5

diff --git a/test/threed_test.cc b/test/threed_test.cc
index a8d3f8a00..f0ee13c9a 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,13 +23,17 @@
  *  @ingroup completedcp
  */
 
-#include <boost/test/unit_test.hpp>
 #include "test.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
+#include "lib/config.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/job.h"
+#include <boost/test/unit_test.hpp>
 #include <iostream>
 
 using std::cout;
@@ -42,7 +46,7 @@ BOOST_AUTO_TEST_CASE (threed_test1)
 	film->set_name ("test_film1");
 	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
 	film->examine_and_add_content (c);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
 	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
@@ -65,7 +69,7 @@ BOOST_AUTO_TEST_CASE (threed_test2)
 	film->set_name ("test_film2");
 	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
 	film->examine_and_add_content (c);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_ALTERNATE);
 	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
@@ -89,7 +93,7 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 	film->examine_and_add_content (L);
 	shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/test.mp4"));
 	film->examine_and_add_content (R);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
 	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
@@ -103,12 +107,14 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
+	Config::instance()->set_master_encoding_threads (8);
+
 	shared_ptr<Film> film = new_test_film2 ("threed_test4");
 	shared_ptr<FFmpegContent> L (new FFmpegContent(private_data / "LEFT_TEST_DCP3D4K.mov"));
 	film->examine_and_add_content (L);
 	shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov"));
 	film->examine_and_add_content (R);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
 	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
@@ -118,16 +124,20 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 	film->write_metadata ();
 
 	BOOST_REQUIRE (!wait_for_jobs ());
+
+	Config::instance()->set_master_encoding_threads (8);
 }
 
 BOOST_AUTO_TEST_CASE (threed_test5)
 {
+	Config::instance()->set_master_encoding_threads (8);
+
 	shared_ptr<Film> film = new_test_film2 ("threed_test5");
 	shared_ptr<FFmpegContent> L (new FFmpegContent(private_data / "boon_telly.mkv"));
 	film->examine_and_add_content (L);
 	shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "boon_telly.mkv"));
 	film->examine_and_add_content (R);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
 	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
@@ -137,4 +147,62 @@ BOOST_AUTO_TEST_CASE (threed_test5)
 	film->write_metadata ();
 
 	BOOST_REQUIRE (!wait_for_jobs ());
+
+	Config::instance()->set_master_encoding_threads (1);
+}
+
+BOOST_AUTO_TEST_CASE (threed_test6)
+{
+	shared_ptr<Film> film = new_test_film2 ("threed_test6");
+	shared_ptr<FFmpegContent> L (new FFmpegContent("test/data/3dL.mp4"));
+	film->examine_and_add_content (L);
+	shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/3dR.mp4"));
+	film->examine_and_add_content (R);
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
+	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
+
+	film->set_three_d (true);
+	film->make_dcp ();
+	film->write_metadata ();
+
+	BOOST_REQUIRE (!wait_for_jobs());
+	check_dcp ("test/data/threed_test6", film->dir(film->dcp_name()));
+}
+
+/** Check 2D content set as being 3D; this should give an informative error */
+BOOST_AUTO_TEST_CASE (threed_test7)
+{
+	shared_ptr<Film> film = new_test_film2 ("threed_test7");
+	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/red_24.mp4"));
+	film->examine_and_add_content (c);
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	c->video->set_frame_type (VIDEO_FRAME_TYPE_3D);
+
+	film->set_three_d (true);
+	film->make_dcp ();
+	film->write_metadata ();
+
+	JobManager* jm = JobManager::instance ();
+	while (jm->work_to_do ()) {
+		while (signal_manager->ui_idle()) {}
+		dcpomatic_sleep (1);
+	}
+
+	BOOST_REQUIRE (jm->errors());
+	shared_ptr<Job> failed;
+	BOOST_FOREACH (shared_ptr<Job> i, jm->_jobs) {
+		if (i->finished_in_error()) {
+			BOOST_REQUIRE (!failed);
+			failed = i;
+		}
+	}
+	BOOST_REQUIRE (failed);
+	BOOST_CHECK_EQUAL (failed->error_summary(), "The content file test/data/red_24.mp4 is set as 3D but does not appear to contain 3D images.  Please set it to 2D.  You can still make a 3D DCP from this content by ticking the 3D option in the DCP video tab.");
+
+	while (signal_manager->ui_idle ()) {}
+
+	JobManager::drop ();
 }