X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=78e656830b65158afde56a2a8ca1e12b613fcc87;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=a8d3f8a00f737d03fcecb941fc531b65ee41e462;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/test/threed_test.cc b/test/threed_test.cc index a8d3f8a00..78e656830 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,29 +23,32 @@ * @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; -using boost::shared_ptr; +using std::shared_ptr; -/** Basic sanity check of 3D_LEFT_RIGHT */ +/** Basic sanity check of THREE_D_LEFT_RIGHT */ BOOST_AUTO_TEST_CASE (threed_test1) { shared_ptr film = new_test_film ("threed_test1"); film->set_name ("test_film1"); 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"))); + c->video->set_frame_type (VideoFrameType::THREE_D_LEFT_RIGHT); film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); @@ -56,7 +59,7 @@ BOOST_AUTO_TEST_CASE (threed_test1) BOOST_REQUIRE (!wait_for_jobs ()); } -/** Basic sanity check of 3D_ALTERNATE; at the moment this is just to make sure +/** Basic sanity check of THREE_D_ALTERNATE; at the moment this is just to make sure * that such a transcode completes without error. */ BOOST_AUTO_TEST_CASE (threed_test2) @@ -65,10 +68,9 @@ BOOST_AUTO_TEST_CASE (threed_test2) film->set_name ("test_film2"); 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"))); + c->video->set_frame_type (VideoFrameType::THREE_D_ALTERNATE); film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); @@ -79,7 +81,7 @@ BOOST_AUTO_TEST_CASE (threed_test2) BOOST_REQUIRE (!wait_for_jobs ()); } -/** Basic sanity check of 3D_LEFT and 3D_RIGHT; at the moment this is just to make sure +/** Basic sanity check of THREE_D_LEFT and THREE_D_RIGHT; at the moment this is just to make sure * that such a transcode completes without error. */ BOOST_AUTO_TEST_CASE (threed_test3) @@ -89,10 +91,10 @@ BOOST_AUTO_TEST_CASE (threed_test3) film->examine_and_add_content (L); 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); + L->video->set_frame_type (VideoFrameType::THREE_D_LEFT); + R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT); film->set_three_d (true); film->make_dcp (); @@ -104,14 +106,20 @@ BOOST_AUTO_TEST_CASE (threed_test3) BOOST_AUTO_TEST_CASE (threed_test4) { shared_ptr film = new_test_film2 ("threed_test4"); - shared_ptr L (new FFmpegContent(private_data / "LEFT_TEST_DCP3D4K.mov")); + shared_ptr L (new FFmpegContent(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov")); film->examine_and_add_content (L); - shared_ptr R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov")); + shared_ptr R (new FFmpegContent(TestPaths::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); + L->video->set_frame_type (VideoFrameType::THREE_D_LEFT); + R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT); + /* There doesn't seem much point in encoding the whole input, especially as we're only + * checking for errors during the encode and not the result. Also decoding these files + * (4K HQ Prores) is very slow. + */ + L->set_trim_end (dcpomatic::ContentTime::from_seconds(22)); + R->set_trim_end (dcpomatic::ContentTime::from_seconds(22)); film->set_three_d (true); film->make_dcp (); @@ -123,14 +131,19 @@ BOOST_AUTO_TEST_CASE (threed_test4) BOOST_AUTO_TEST_CASE (threed_test5) { shared_ptr film = new_test_film2 ("threed_test5"); - shared_ptr L (new FFmpegContent(private_data / "boon_telly.mkv")); + shared_ptr L (new FFmpegContent(TestPaths::private_data() / "boon_telly.mkv")); film->examine_and_add_content (L); - shared_ptr R (new FFmpegContent(private_data / "boon_telly.mkv")); + shared_ptr R (new FFmpegContent(TestPaths::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); + L->video->set_frame_type (VideoFrameType::THREE_D_LEFT); + R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT); + /* There doesn't seem much point in encoding the whole input, especially as we're only + * checking for errors during the encode and not the result. + */ + L->set_trim_end (dcpomatic::ContentTime::from_seconds(3 * 60 + 20)); + R->set_trim_end (dcpomatic::ContentTime::from_seconds(3 * 60 + 20)); film->set_three_d (true); film->make_dcp (); @@ -138,3 +151,69 @@ BOOST_AUTO_TEST_CASE (threed_test5) BOOST_REQUIRE (!wait_for_jobs ()); } + +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 (VideoFrameType::THREE_D_LEFT); + R->video->set_frame_type (VideoFrameType::THREE_D_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) +{ + using boost::filesystem::path; + + shared_ptr film = new_test_film2 ("threed_test7"); + path const content_path = "test/data/red_24.mp4"; + shared_ptr c (new FFmpegContent(content_path)); + film->examine_and_add_content (c); + BOOST_REQUIRE (!wait_for_jobs()); + + c->video->set_frame_type (VideoFrameType::THREE_D); + + 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_seconds (1); + } + + while (signal_manager->ui_idle ()) {} + + std::cout << "Here's the jobs:\n"; + for (auto 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; + for (auto i: jm->_jobs) { + if (i->finished_in_error()) { + BOOST_REQUIRE (!failed); + failed = i; + } + } + BOOST_REQUIRE (failed); + BOOST_CHECK_EQUAL (failed->error_summary(), String::compose("The content file %1 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.", content_path.string())); + + while (signal_manager->ui_idle ()) {} + + JobManager::drop (); +}