projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use icu to remove diacritics from strings.
[dcpomatic.git]
/
test
/
ffmpeg_dcp_test.cc
diff --git
a/test/ffmpeg_dcp_test.cc
b/test/ffmpeg_dcp_test.cc
index 4b2388bcde3486ca71dd998a8d32157b807b1b38..ea3b8d4f9d8ea2b0b81f6725bd6a9482d1cffd9a 100644
(file)
--- a/
test/ffmpeg_dcp_test.cc
+++ b/
test/ffmpeg_dcp_test.cc
@@
-20,7
+20,7
@@
/** @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
+ * @ingroup
feature
*
* Also a quick test of Film::have_dcp ().
*/
*
* Also a quick test of Film::have_dcp ().
*/
@@
-35,7
+35,7
@@
#include "lib/video_content.h"
#include "test.h"
#include "lib/video_content.h"
#include "test.h"
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
{
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
{
@@
-44,20
+44,18
@@
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
film->examine_and_add_content (c);
shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
film->examine_and_add_content (c);
- wait_for_jobs ();
-
- c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+ 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 ();
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
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");
shared_ptr<Film> film (new Film (p));
{
boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
shared_ptr<Film> film (new Film (p));