X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fthreed_test.cc;h=efa563966b87446f02da537347068b9dd5ac1e93;hb=9cbe57dda759fccfa9dec8a0820114d7d8583a36;hp=23236fb31fa5e36c1eaf4e5b6de05880da4302d1;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 23236fb31..efa563966 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>
@@ -29,18 +30,17 @@
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/video_content.h"
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 using std::cout;
 using boost::shared_ptr;
-using boost::make_shared;
 
-BOOST_AUTO_TEST_CASE (threed_test)
+/** Basic sanity check of 3D_LEFT_RIGHT */
+BOOST_AUTO_TEST_CASE (threed_test1)
 {
-	shared_ptr<Film> film = new_test_film ("threed_test");
-	film->set_name ("test_film2");
-	shared_ptr<FFmpegContent> c = make_shared<FFmpegContent> (film, "test/data/test.mp4");
+	shared_ptr<Film> film = new_test_film ("threed_test1");
+	film->set_name ("test_film1");
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
 	film->examine_and_add_content (c);
 	wait_for_jobs ();
 
@@ -48,10 +48,74 @@ 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 ();
+
+	BOOST_REQUIRE (!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 ();
+
+	BOOST_REQUIRE (!wait_for_jobs ());
+}
+
+/** Basic sanity check of 3D_LEFT and 3D_RIGHT; at the moment this is just to make sure
+ *  that such a transcode completes without error.
+ */
+BOOST_AUTO_TEST_CASE (threed_test3)
+{
+	shared_ptr<Film> film = new_test_film2 ("threed_test3");
+	shared_ptr<FFmpegContent> L (new FFmpegContent (film, "test/data/test.mp4"));
+	film->examine_and_add_content (L);
+	shared_ptr<FFmpegContent> R (new FFmpegContent (film, "test/data/test.mp4"));
+	film->examine_and_add_content (R);
+	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 ());
+}
+
+BOOST_AUTO_TEST_CASE (threed_test4)
+{
+	shared_ptr<Film> film = new_test_film2 ("threed_test4");
+	shared_ptr<FFmpegContent> L (new FFmpegContent (film, private_data / "LEFT_TEST_DCP3D4K.mov"));
+	film->examine_and_add_content (L);
+	shared_ptr<FFmpegContent> R (new FFmpegContent (film, private_data / "RIGHT_TEST_DCP3D4K.mov"));
+	film->examine_and_add_content (R);
 	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 ());
 }