/*
- Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
/** @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/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/job.h"
+#include "lib/job_manager.h"
+#include "lib/ratio.h"
+#include "lib/video_content.h"
+#include "test.h"
#include <boost/test/unit_test.hpp>
#include <iostream>
+
using std::cout;
+using std::make_shared;
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> film = new_test_film ("threed_test1");
+ auto film = new_test_film ("threed_test1");
film->set_name ("test_film1");
- shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
+ auto c = make_shared<FFmpegContent>("test/data/test.mp4");
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
- c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
+ 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 ();
-
- BOOST_REQUIRE (!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> film = new_test_film ("threed_test2");
+ auto film = new_test_film ("threed_test2");
film->set_name ("test_film2");
- shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
+ auto c = make_shared<FFmpegContent>("test/data/test.mp4");
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
- c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_ALTERNATE);
+ 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);
- film->make_dcp ();
- film->write_metadata ();
-
- BOOST_REQUIRE (!wait_for_jobs ());
+ make_and_verify_dcp (film);
}
-/** 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)
{
shared_ptr<Film> film = new_test_film2 ("threed_test3");
- shared_ptr<FFmpegContent> L (new FFmpegContent("test/data/test.mp4"));
+ auto L = make_shared<FFmpegContent>("test/data/test.mp4");
film->examine_and_add_content (L);
- shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/test.mp4"));
+ auto R = make_shared<FFmpegContent>("test/data/test.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);
+ 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 ());
+ make_and_verify_dcp (film);
}
+
BOOST_AUTO_TEST_CASE (threed_test4)
{
- shared_ptr<Film> film = new_test_film2 ("threed_test4");
- shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov"));
+ auto film = new_test_film2 ("threed_test4");
+ auto L = make_shared<FFmpegContent>(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov");
film->examine_and_add_content (L);
- shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data() / "RIGHT_TEST_DCP3D4K.mov"));
+ auto R = make_shared<FFmpegContent>(TestPaths::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);
+ 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.
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)
{
- shared_ptr<Film> film = new_test_film2 ("threed_test5");
- shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data() / "boon_telly.mkv"));
+ auto film = new_test_film2 ("threed_test5");
+ auto L = make_shared<FFmpegContent>(TestPaths::private_data() / "boon_telly.mkv");
film->examine_and_add_content (L);
- shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data() / "boon_telly.mkv"));
+ auto R = make_shared<FFmpegContent>(TestPaths::private_data() / "boon_telly.mkv");
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);
+ 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.
*/
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)
{
- shared_ptr<Film> film = new_test_film2 ("threed_test6");
- shared_ptr<FFmpegContent> L (new FFmpegContent("test/data/3dL.mp4"));
+ auto film = new_test_film2 ("threed_test6");
+ auto L = make_shared<FFmpegContent>("test/data/3dL.mp4");
film->examine_and_add_content (L);
- shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/3dR.mp4"));
+ auto R = make_shared<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);
+ 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());
+ 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;
- shared_ptr<Film> film = new_test_film2 ("threed_test7");
- path const content_path = "test/data/red_24.mp4";
- shared_ptr<FFmpegContent> c (new FFmpegContent(content_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 (VIDEO_FRAME_TYPE_3D);
+ c->video->set_frame_type (VideoFrameType::THREE_D);
+ c->video->set_length (24);
film->set_three_d (true);
film->make_dcp ();
film->write_metadata ();
- JobManager* jm = JobManager::instance ();
+ auto 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<Job> failed;
for (auto i: jm->_jobs) {
projects / dcpomatic.git / blobdiff