X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=2ff09c1275296f0d830e0e096d6797c52024029a;hb=8775f802d15e19ff9251d0daff49994a0fc145bc;hp=efa563966b87446f02da537347068b9dd5ac1e93;hpb=1954ed123a1adf18c56fc18beb363116260256a6;p=dcpomatic.git diff --git a/test/threed_test.cc b/test/threed_test.cc index efa563966..2ff09c127 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -23,13 +23,17 @@ * @ingroup completedcp */ -#include #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 #include using std::cout; @@ -40,9 +44,9 @@ BOOST_AUTO_TEST_CASE (threed_test1) { shared_ptr film = new_test_film ("threed_test1"); film->set_name ("test_film1"); - shared_ptr c (new FFmpegContent (film, "test/data/test.mp4")); + shared_ptr 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"))); @@ -63,9 +67,9 @@ BOOST_AUTO_TEST_CASE (threed_test2) { shared_ptr film = new_test_film ("threed_test2"); film->set_name ("test_film2"); - shared_ptr c (new FFmpegContent (film, "test/data/test.mp4")); + shared_ptr 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"))); @@ -85,11 +89,11 @@ BOOST_AUTO_TEST_CASE (threed_test2) BOOST_AUTO_TEST_CASE (threed_test3) { shared_ptr film = new_test_film2 ("threed_test3"); - shared_ptr L (new FFmpegContent (film, "test/data/test.mp4")); + shared_ptr L (new FFmpegContent("test/data/test.mp4")); film->examine_and_add_content (L); - shared_ptr R (new FFmpegContent (film, "test/data/test.mp4")); + shared_ptr 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,37 @@ BOOST_AUTO_TEST_CASE (threed_test3) BOOST_AUTO_TEST_CASE (threed_test4) { + Config::instance()->set_master_encoding_threads (8); + shared_ptr film = new_test_film2 ("threed_test4"); - shared_ptr L (new FFmpegContent (film, private_data / "LEFT_TEST_DCP3D4K.mov")); + shared_ptr L (new FFmpegContent(private_data / "LEFT_TEST_DCP3D4K.mov")); + film->examine_and_add_content (L); + shared_ptr R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov")); + 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 ()); + + Config::instance()->set_master_encoding_threads (8); +} + +BOOST_AUTO_TEST_CASE (threed_test5) +{ + Config::instance()->set_master_encoding_threads (8); + + shared_ptr film = new_test_film2 ("threed_test5"); + shared_ptr L (new FFmpegContent(private_data / "boon_telly.mkv")); film->examine_and_add_content (L); - shared_ptr R (new FFmpegContent (film, private_data / "RIGHT_TEST_DCP3D4K.mov")); + shared_ptr 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); @@ -118,4 +147,69 @@ BOOST_AUTO_TEST_CASE (threed_test4) film->write_metadata (); BOOST_REQUIRE (!wait_for_jobs ()); + + Config::instance()->set_master_encoding_threads (1); +} + +BOOST_AUTO_TEST_CASE (threed_test6) +{ + shared_ptr film = new_test_film2 ("threed_test6"); + shared_ptr L (new FFmpegContent("test/data/3dL.mp4")); + film->examine_and_add_content (L); + shared_ptr 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 = new_test_film2 ("threed_test7"); + shared_ptr 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); + } + + while (signal_manager->ui_idle ()) {} + + std::cout << "Here's the jobs:\n"; + BOOST_FOREACH (shared_ptr i, jm->_jobs) { + std::cout << i->name() << " " << i->status() << " " << i->is_new() << " " << i->running() << " " << i->finished() << " " << i->finished_ok() << " " << i->finished_in_error() << "\n"; + } + + BOOST_REQUIRE (jm->errors()); + shared_ptr failed; + BOOST_FOREACH (shared_ptr 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 (); }