projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ISDCF name fixes with > 6 channels and HI/VI (#1633).
[dcpomatic.git]
/
test
/
ffmpeg_dcp_test.cc
diff --git
a/test/ffmpeg_dcp_test.cc
b/test/ffmpeg_dcp_test.cc
index c69516b9f65714abedaec5fec6f625d2b4c0d07b..78847e40b9450464dc8bea3924051e79774fa4f3 100644
(file)
--- a/
test/ffmpeg_dcp_test.cc
+++ b/
test/ffmpeg_dcp_test.cc
@@
-20,48
+20,47
@@
/** @file test/ffmpeg_dcp_test.cc
* @brief Test creation of a very simple DCP from some FFmpegContent (data/test.mp4).
/** @file test/ffmpeg_dcp_test.cc
* @brief Test creation of a very simple DCP from some FFmpegContent (data/test.mp4).
+ * @ingroup specific
*
* Also a quick test of Film::have_dcp ().
*/
*
* 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/ffmpeg_content.h"
#include "lib/ratio.h"
#include "lib/dcp_content_type.h"
#include "lib/video_content.h"
#include "test.h"
#include "lib/film.h"
#include "lib/ffmpeg_content.h"
#include "lib/ratio.h"
#include "lib/dcp_content_type.h"
#include "lib/video_content.h"
#include "test.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/make_shared.hpp>
using boost::shared_ptr;
using boost::shared_ptr;
-using boost::make_shared;
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
{
shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
film->set_name ("test_film2");
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
{
shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
film->set_name ("test_film2");
- shared_ptr<FFmpegContent> c
= make_shared<FFmpegContent> (film, "test/data/test.mp4"
);
+ shared_ptr<FFmpegContent> c
(new FFmpegContent("test/data/test.mp4")
);
film->examine_and_add_content (c);
film->examine_and_add_content (c);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
film->set_container (Ratio::from_id ("185"));
c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
film->set_container (Ratio::from_id ("185"));
- film->set_dcp_content_type (DCPContentType::from_
pretty_name ("Test
"));
+ film->set_dcp_content_type (DCPContentType::from_
isdcf_name ("TST
"));
film->make_dcp ();
film->write_metadata ();
film->make_dcp ();
film->write_metadata ();
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
}
/** Briefly test Film::cpls(). Requires the output from ffmpeg_dcp_test above */
}
/** Briefly test Film::cpls(). Requires the output from ffmpeg_dcp_test above */
-BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
+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");
{
boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
- shared_ptr<Film> film
= boost::make_shared<Film> (p.string (
));
+ shared_ptr<Film> film
(new Film (p
));
film->read_metadata ();
BOOST_CHECK (!film->cpls().empty());
film->read_metadata ();
BOOST_CHECK (!film->cpls().empty());