/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
/** @file test/ffmpeg_dcp_test.cc
* @brief Test creation of a very simple DCP from some FFmpegContent (data/test.mp4).
* @ingroup feature
* Also a quick test of Film::have_dcp ().
*/
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
-#include "lib/film.h"
+
+#include "lib/dcp_content_type.h"
#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
#include "lib/ratio.h"
-#include "lib/dcp_content_type.h"
#include "lib/video_content.h"
#include "test.h"
+#include <boost/algorithm/string.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+
+
+using std::make_shared;
-using std::shared_ptr;
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
{
- shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
+ auto film = new_test_film ("ffmpeg_dcp_test");
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());
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
- film->make_dcp ();
- film->write_metadata ();
+ make_and_verify_dcp (film);
BOOST_REQUIRE (!wait_for_jobs());
}
-/** Briefly test Film::cpls(). Requires the output from ffmpeg_dcp_test above */
+
+/** Briefly test Film::cpls() */
BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test, * boost::unit_test::depends_on("ffmpeg_dcp_test"))
{
- boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
- shared_ptr<Film> film (new Film (p));
+ auto p = test_film_dir ("ffmpeg_dcp_test");
+ auto film = make_shared<Film>(p);
film->read_metadata ();
BOOST_CHECK (!film->cpls().empty());
p /= film->dcp_name();
- boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (p);
- while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) {
+ auto i = boost::filesystem::directory_iterator (p);
+ while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with(i->path().filename().string(), "j2c")) {
++i;
}