X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fthreed_test.cc;h=f98464fb5810329d20a6a6903ed2b175bc4fb9b6;hp=30de1f1a20fa86ab70665bb35d93b72f95bf5d6b;hb=b0d658e5c5b953b38e341a90518b5e7b2108811a;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0 diff --git a/test/threed_test.cc b/test/threed_test.cc index 30de1f1a2..f98464fb5 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,62 +18,192 @@ */ + /** @file test/threed_test.cc * @brief Create some 3D DCPs (without comparing the results to anything). * @ingroup completedcp */ -#include -#include "test.h" -#include "lib/film.h" -#include "lib/ratio.h" + +#include "lib/config.h" +#include "lib/content_factory.h" +#include "lib/cross.h" #include "lib/dcp_content_type.h" #include "lib/ffmpeg_content.h" +#include "lib/film.h" +#include "lib/job.h" +#include "lib/job_manager.h" +#include "lib/ratio.h" #include "lib/video_content.h" +#include "test.h" +#include #include + using std::cout; -using boost::shared_ptr; +using std::make_shared; +using std::shared_ptr; + +/** Basic sanity check of THREE_D_LEFT_RIGHT */ BOOST_AUTO_TEST_CASE (threed_test1) { - shared_ptr film = new_test_film ("threed_test2"); - film->set_name ("test_film2"); - shared_ptr c (new FFmpegContent (film, "test/data/test.mp4")); + auto film = new_test_film ("threed_test1"); + film->set_name ("test_film1"); + auto c = make_shared("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")); film->set_three_d (true); - film->make_dcp (); - film->write_metadata (); - - wait_for_jobs (); + make_and_verify_dcp (film); } -/** 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) { - shared_ptr film = new_test_film ("threed_test2"); + auto film = new_test_film ("threed_test2"); film->set_name ("test_film2"); - shared_ptr c (new FFmpegContent (film, "test/data/test.mp4")); + auto c = make_shared("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")); + film->set_three_d (true); + make_and_verify_dcp (film); +} + + +/** 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) +{ + shared_ptr film = new_test_film2 ("threed_test3"); + auto L = make_shared("test/data/test.mp4"); + film->examine_and_add_content (L); + auto R = make_shared("test/data/test.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); + make_and_verify_dcp (film); +} + + +BOOST_AUTO_TEST_CASE (threed_test4) +{ + auto film = new_test_film2 ("threed_test4"); + auto L = make_shared(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov"); + film->examine_and_add_content (L); + auto R = make_shared(TestPaths::private_data() / "RIGHT_TEST_DCP3D4K.mov"); + 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); + /* 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); + make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D}); +} + + +BOOST_AUTO_TEST_CASE (threed_test5) +{ + auto film = new_test_film2 ("threed_test5"); + auto L = make_shared(TestPaths::private_data() / "boon_telly.mkv"); + film->examine_and_add_content (L); + auto R = make_shared(TestPaths::private_data() / "boon_telly.mkv"); + 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); + /* 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); + make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K}); +} + + +BOOST_AUTO_TEST_CASE (threed_test6) +{ + auto film = new_test_film2 ("threed_test6"); + auto L = make_shared("test/data/3dL.mp4"); + film->examine_and_add_content (L); + auto R = make_shared("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); + make_and_verify_dcp (film); + 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; + + auto film = new_test_film2 ("threed_test7"); + path const content_path = "test/data/flat_red.png"; + auto c = content_factory(content_path).front(); + film->examine_and_add_content (c); + BOOST_REQUIRE (!wait_for_jobs()); + + c->video->set_frame_type (VideoFrameType::THREE_D); + c->video->set_length (24); + film->set_three_d (true); film->make_dcp (); film->write_metadata (); - wait_for_jobs (); + auto jm = JobManager::instance (); + while (jm->work_to_do ()) { + while (signal_manager->ui_idle()) {} + dcpomatic_sleep_seconds (1); + } + + while (signal_manager->ui_idle ()) {} + + 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 (); }