X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fthreed_test.cc;h=4413ff01bcc737c7962da57abebb89c79e78dff7;hp=8b58e2bfb79c8b850d60998c78572dd58820f7e8;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=4a2efeb3c35babad46eebfbb56fa9a0a7c215d3b diff --git a/test/threed_test.cc b/test/threed_test.cc index 8b58e2bfb..4413ff01b 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2019 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,21 +18,29 @@ */ + /** @file test/threed_test.cc * @brief Create some 3D DCPs (without comparing the results to anything). * @ingroup completedcp */ -#include "test.h" -#include "lib/film.h" -#include "lib/ratio.h" + +#include "lib/butler.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/video_content.h" -#include "lib/job_manager.h" -#include "lib/cross.h" +#include "lib/film.h" +#include "lib/image.h" #include "lib/job.h" +#include "lib/job_manager.h" +#include "lib/make_dcp.h" +#include "lib/player.h" +#include "lib/ratio.h" +#include "lib/util.h" +#include "lib/video_content.h" +#include "test.h" #include #include @@ -56,12 +64,10 @@ BOOST_AUTO_TEST_CASE (threed_test1) 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 ()); + make_and_verify_dcp (film); } + /** Basic sanity check of THREE_D_ALTERNATE; at the moment this is just to make sure * that such a transcode completes without error. */ @@ -78,12 +84,10 @@ BOOST_AUTO_TEST_CASE (threed_test2) 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 ()); + 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. */ @@ -100,14 +104,17 @@ BOOST_AUTO_TEST_CASE (threed_test3) 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 ()); + make_and_verify_dcp (film); } + BOOST_AUTO_TEST_CASE (threed_test4) { + ConfigRestorer cr; + + /* Try to stop out-of-memory crashes on my laptop */ + Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 4); + auto film = new_test_film2 ("threed_test4"); auto L = make_shared(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov"); film->examine_and_add_content (L); @@ -125,12 +132,10 @@ BOOST_AUTO_TEST_CASE (threed_test4) R->set_trim_end (dcpomatic::ContentTime::from_seconds(22)); film->set_three_d (true); - film->make_dcp (); - film->write_metadata (); - - BOOST_REQUIRE (!wait_for_jobs ()); + 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"); @@ -149,12 +154,10 @@ BOOST_AUTO_TEST_CASE (threed_test5) R->set_trim_end (dcpomatic::ContentTime::from_seconds(3 * 60 + 20)); film->set_three_d (true); - film->make_dcp (); - film->write_metadata (); - - BOOST_REQUIRE (!wait_for_jobs ()); + 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"); @@ -168,28 +171,27 @@ BOOST_AUTO_TEST_CASE (threed_test6) 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()); + 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/red_24.mp4"; - auto c = make_shared(content_path); + 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 (); + make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); film->write_metadata (); auto jm = JobManager::instance (); @@ -215,3 +217,77 @@ BOOST_AUTO_TEST_CASE (threed_test7) JobManager::drop (); } + + +/** Trigger a -114 error by trying to make a 3D DCP out of two files with slightly + * different lengths. + */ +BOOST_AUTO_TEST_CASE (threed_test_separate_files_slightly_different_lengths) +{ + 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); + R->set_trim_end (dcpomatic::ContentTime::from_frames(1, 24)); + + film->set_three_d (true); + make_and_verify_dcp (film); +} + + +/** Trigger a -114 error by trying to make a 3D DCP out of two files with very + * different lengths. + */ +BOOST_AUTO_TEST_CASE (threed_test_separate_files_very_different_lengths) +{ + 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); + R->set_trim_end (dcpomatic::ContentTime::from_seconds(1.5)); + + film->set_three_d (true); + make_and_verify_dcp (film); +} + + +BOOST_AUTO_TEST_CASE (threed_test_butler_overfill) +{ + auto film = new_test_film2("threed_test_butler_overfill"); + auto A = make_shared(TestPaths::private_data() / "arrietty_JP-EN.mkv"); + film->examine_and_add_content(A); + auto B = make_shared(TestPaths::private_data() / "arrietty_JP-EN.mkv"); + film->examine_and_add_content(B); + BOOST_REQUIRE (!wait_for_jobs()); + + auto player = std::make_shared(film, Image::Alignment::COMPACT); + int const audio_channels = 2; + auto butler = std::make_shared( + film, player, AudioMapping(), audio_channels, boost::bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::ENABLED + ); + + int const audio_frames = 1920; + std::vector audio(audio_frames * audio_channels); + + B->video->set_frame_type(VideoFrameType::THREE_D_RIGHT); + B->set_position(film, dcpomatic::DCPTime()); + + butler->seek(dcpomatic::DCPTime(), true); + Butler::Error error; + for (auto i = 0; i < 960; ++i) { + butler->get_video(Butler::Behaviour::BLOCKING, &error); + butler->get_audio(Butler::Behaviour::BLOCKING, audio.data(), audio_frames); + } + BOOST_REQUIRE (error.code == Butler::Error::Code::NONE); +} +