projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Flush audio decoder when a DCPDecoder finishes so that
[dcpomatic.git]
/
test
/
ffmpeg_dcp_test.cc
diff --git
a/test/ffmpeg_dcp_test.cc
b/test/ffmpeg_dcp_test.cc
index 7cdecb22f32ce6a302db6492be27623e04b2b79e..78847e40b9450464dc8bea3924051e79774fa4f3 100644
(file)
--- a/
test/ffmpeg_dcp_test.cc
+++ b/
test/ffmpeg_dcp_test.cc
@@
-41,10
+41,10
@@
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
{
shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
film->set_name ("test_film2");
{
shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
film->set_name ("test_film2");
- shared_ptr<FFmpegContent> c (new 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")));
c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
@@
-53,11
+53,11
@@
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
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");
shared_ptr<Film> film (new Film (p));
{
boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
shared_ptr<Film> film (new Film (p));