X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=30de1f1a20fa86ab70665bb35d93b72f95bf5d6b;hb=985572392bf42ac433510c86e6676bcacac85f56;hp=ab94cf8e5b888a562b2612ce5a38006a17d0cfc8;hpb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index ab94cf8e5..30de1f1a2 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -19,7 +19,8 @@
 */
 
 /** @file  test/threed_test.cc
- *  @brief Create a 3D DCP (without comparing the result to anything).
+ *  @brief Create some 3D DCPs (without comparing the results to anything).
+ *  @ingroup completedcp
  */
 
 #include <boost/test/unit_test.hpp>
@@ -34,9 +35,9 @@
 using std::cout;
 using boost::shared_ptr;
 
-BOOST_AUTO_TEST_CASE (threed_test)
+BOOST_AUTO_TEST_CASE (threed_test1)
 {
-	shared_ptr<Film> film = new_test_film ("threed_test");
+	shared_ptr<Film> film = new_test_film ("threed_test2");
 	film->set_name ("test_film2");
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
 	film->examine_and_add_content (c);
@@ -46,7 +47,30 @@ BOOST_AUTO_TEST_CASE (threed_test)
 	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
 	film->set_container (Ratio::from_id ("185"));
-	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+	film->set_three_d (true);
+	film->make_dcp ();
+	film->write_metadata ();
+
+	wait_for_jobs ();
+}
+
+/** Basic sanity check of 3D-alternate; at the moment this is just to make sure
+ *  that such a transcode completes without error.
+ */
+BOOST_AUTO_TEST_CASE (threed_test2)
+{
+	shared_ptr<Film> film = new_test_film ("threed_test2");
+	film->set_name ("test_film2");
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+	film->examine_and_add_content (c);
+	wait_for_jobs ();
+
+	c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_ALTERNATE);
+	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+
+	film->set_container (Ratio::from_id ("185"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	film->set_three_d (true);
 	film->make_dcp ();
 	film->write_metadata ();