/*
- Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
+#include "lib/content.h"
+#include "lib/content_factory.h"
+#include "lib/dcp_content_type.h"
#include "lib/dcp_encoder.h"
-#include "lib/writer.h"
-#include "lib/transcode_job.h"
-#include "lib/job_manager.h"
+#include "lib/dcpomatic_log.h"
#include "lib/film.h"
+#include "lib/job_manager.h"
#include "lib/ratio.h"
-#include "lib/content_factory.h"
-#include "lib/dcp_content_type.h"
-#include "lib/content.h"
+#include "lib/transcode_job.h"
#include "lib/video_content.h"
-#include "lib/dcpomatic_log.h"
+#include "lib/writer.h"
#include "test.h"
-#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
+#include <boost/test/unit_test.hpp>
+
+using std::dynamic_pointer_cast;
using std::getline;
using std::ifstream;
using std::string;
using std::vector;
using boost::starts_with;
using boost::split;
-using std::dynamic_pointer_cast;
-using std::shared_ptr;
+
static
void
BOOST_CHECK_EQUAL (repeat, check_repeat);
}
+
/** Make a 2D DCP out of a 2D still and check that the J2K encoding is only done once for each frame */
BOOST_AUTO_TEST_CASE (optimise_stills_test1)
{
- shared_ptr<Film> film = new_test_film ("optimise_stills_test1");
+ auto film = new_test_film ("optimise_stills_test1");
LogSwitcher ls (film->log());
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
- shared_ptr<Content> content = content_factory("test/data/flat_red.png").front ();
+ auto content = content_factory("test/data/flat_red.png")[0];
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs ());
+ make_and_verify_dcp (film);
check ("optimise_stills_test1", 1, 10 * 24 - 1);
}
+
/** Make a 3D DCP out of a 3D L/R still and check that the J2K encoding is only done once for L and R */
BOOST_AUTO_TEST_CASE (optimise_stills_test2)
{
- shared_ptr<Film> film = new_test_film ("optimise_stills_test2");
+ auto film = new_test_film ("optimise_stills_test2");
LogSwitcher ls (film->log());
film->set_container (Ratio::from_id ("185"));
- film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
+ film->set_dcp_content_type (DCPContentType::from_isdcf_name("TLR"));
film->set_name ("frobozz");
- shared_ptr<Content> content = content_factory("test/data/flat_red.png").front ();
+ auto content = content_factory("test/data/flat_red.png")[0];
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
content->video->set_frame_type (VideoFrameType::THREE_D_LEFT_RIGHT);
film->set_three_d (true);
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs ());
+ make_and_verify_dcp (film);
check ("optimise_stills_test2", 2, 10 * 48 - 2);
}