projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
[dcpomatic.git]
/
test
/
ffmpeg_dcp_test.cc
diff --git
a/test/ffmpeg_dcp_test.cc
b/test/ffmpeg_dcp_test.cc
index 06cb56e7dd490436841b8f89abcfb8045f1c9778..c79acd3dfb30deda09577736875a2d1d23c6cb67 100644
(file)
--- a/
test/ffmpeg_dcp_test.cc
+++ b/
test/ffmpeg_dcp_test.cc
@@
-17,6
+17,16
@@
*/
*/
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
+#include "lib/film.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/ratio.h"
+#include "lib/dcp_content_type.h"
+#include "test.h"
+
+using boost::shared_ptr;
+
/** @file test/ffmpeg_dcp_test.cc
* @brief Test scaling and black-padding of images from a still-image source.
*/
/** @file test/ffmpeg_dcp_test.cc
* @brief Test scaling and black-padding of images from a still-image source.
*/
@@
-29,23
+39,14
@@
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
c->set_ratio (Ratio::from_id ("185"));
film->examine_and_add_content (c);
c->set_ratio (Ratio::from_id ("185"));
film->examine_and_add_content (c);
- /* Wait for the examine to finish */
- while (JobManager::instance()->work_to_do ()) {
- dcpomatic_sleep (1);
- }
-
- BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
+ wait_for_jobs ();
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
film->make_dcp ();
film->write_metadata ();
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
film->make_dcp ();
film->write_metadata ();
- while (JobManager::instance()->work_to_do ()) {
- dcpomatic_sleep (1);
- }
-
- BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
+ wait_for_jobs ();
}
/** Test Film::have_dcp(). Requires the output from ffmpeg_dcp_test above */
}
/** Test Film::have_dcp(). Requires the output from ffmpeg_dcp_test above */
@@
-54,10
+55,10
@@
BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
shared_ptr<Film> f (new Film (p.string ()));
f->read_metadata ();
boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
shared_ptr<Film> f (new Film (p.string ()));
f->read_metadata ();
- BOOST_CHECK (
f->have_dcp
());
+ BOOST_CHECK (
!f->dcps().empty
());
p /= f->dcp_name();
p /= f->dcp_name();
- p /= f->
dcp_
video_mxf_filename();
+ p /= f->video_mxf_filename();
boost::filesystem::remove (p);
boost::filesystem::remove (p);
- BOOST_CHECK (
!f->have_dcp
());
+ BOOST_CHECK (
f->dcps().empty
());
}
}