projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Protect cross-thread access to _pending_images.
[dcpomatic.git]
/
test
/
recover_test.cc
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index 4222426c3ce9341d6e92bf58e363bedf3705b68c..e8194fd81735f6b9a418cf482e21ee4fce343ac6 100644
(file)
--- a/
test/recover_test.cc
+++ b/
test/recover_test.cc
@@
-55,14
+55,14
@@
BOOST_AUTO_TEST_CASE (recover_test_2d)
film->set_container (Ratio::from_id ("185"));
film->set_name ("recover_test");
film->set_container (Ratio::from_id ("185"));
film->set_name ("recover_test");
- shared_ptr<FFmpegContent> content (new FFmpegContent
(film,
"test/data/count300bd24.m2ts"));
+ shared_ptr<FFmpegContent> content (new FFmpegContent
(
"test/data/count300bd24.m2ts"));
film->examine_and_add_content (content);
film->examine_and_add_content (content);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
film->make_dcp ();
film->make_dcp ();
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
- boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_
84d36460538435d5d511ee533c8528df
_24_100000000_P_S_0_1200000.mxf";
+ boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_
d4343facdd66ca71f62a964fbade89f3
_24_100000000_P_S_0_1200000.mxf";
boost::filesystem::copy_file (
video,
"build/test/recover_test_2d/original.mxf"
boost::filesystem::copy_file (
video,
"build/test/recover_test_2d/original.mxf"
@@
-71,7
+71,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d)
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
film->make_dcp ();
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
film->make_dcp ();
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d/original.mxf"));
shared_ptr<dcp::MonoPictureAsset> B (new dcp::MonoPictureAsset (video));
shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d/original.mxf"));
shared_ptr<dcp::MonoPictureAsset> B (new dcp::MonoPictureAsset (video));
@@
-80,7
+80,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d)
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
}
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
}
-BOOST_AUTO_TEST_CASE (recover_test_3d)
+BOOST_AUTO_TEST_CASE (recover_test_3d
, * boost::unit_test::depends_on("recover_test_2d")
)
{
shared_ptr<Film> film = new_test_film ("recover_test_3d");
film->set_interop (false);
{
shared_ptr<Film> film = new_test_film ("recover_test_3d");
film->set_interop (false);
@@
-89,15
+89,15
@@
BOOST_AUTO_TEST_CASE (recover_test_3d)
film->set_name ("recover_test");
film->set_three_d (true);
film->set_name ("recover_test");
film->set_three_d (true);
- shared_ptr<ImageContent> content (new ImageContent
(film,
"test/data/3d_test"));
+ shared_ptr<ImageContent> content (new ImageContent
(
"test/data/3d_test"));
content->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
film->examine_and_add_content (content);
content->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
film->examine_and_add_content (content);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
film->make_dcp ();
film->make_dcp ();
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
- boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_
961f053444e90c5ddbf978eb0ebfa772
_24_100000000_P_S_3D_0_96000.mxf";
+ boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_
342fe9115d2b446914b31f7602e48cc6
_24_100000000_P_S_3D_0_96000.mxf";
boost::filesystem::copy_file (
video,
boost::filesystem::copy_file (
video,
@@
-107,7
+107,7
@@
BOOST_AUTO_TEST_CASE (recover_test_3d)
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
film->make_dcp ();
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
film->make_dcp ();
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
shared_ptr<dcp::StereoPictureAsset> A (new dcp::StereoPictureAsset ("build/test/recover_test_3d/original.mxf"));
shared_ptr<dcp::StereoPictureAsset> B (new dcp::StereoPictureAsset (video));
shared_ptr<dcp::StereoPictureAsset> A (new dcp::StereoPictureAsset ("build/test/recover_test_3d/original.mxf"));
shared_ptr<dcp::StereoPictureAsset> B (new dcp::StereoPictureAsset (video));
@@
-117,7
+117,7
@@
BOOST_AUTO_TEST_CASE (recover_test_3d)
}
}
-BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
+BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted
, * boost::unit_test::depends_on("recover_test_3d")
)
{
shared_ptr<Film> film = new_test_film ("recover_test_2d_encrypted");
film->set_interop (false);
{
shared_ptr<Film> film = new_test_film ("recover_test_2d_encrypted");
film->set_interop (false);
@@
-125,16
+125,17
@@
BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
film->set_container (Ratio::from_id ("185"));
film->set_name ("recover_test");
film->set_encrypted (true);
film->set_container (Ratio::from_id ("185"));
film->set_name ("recover_test");
film->set_encrypted (true);
+ film->set_key (dcp::Key("eafcb91c9f5472edf01f3a2404c57258"));
- shared_ptr<FFmpegContent> content (new FFmpegContent
(film,
"test/data/count300bd24.m2ts"));
+ shared_ptr<FFmpegContent> content (new FFmpegContent
(
"test/data/count300bd24.m2ts"));
film->examine_and_add_content (content);
film->examine_and_add_content (content);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
film->make_dcp ();
film->make_dcp ();
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
boost::filesystem::path const video =
boost::filesystem::path const video =
- "build/test/recover_test_2d_encrypted/video/185_2K_
84d36460538435d5d511ee533c8528df_24_100000000_E
_S_0_1200000.mxf";
+ "build/test/recover_test_2d_encrypted/video/185_2K_
d4343facdd66ca71f62a964fbade89f3_24_100000000_Eeafcb91c9f5472edf01f3a2404c57258
_S_0_1200000.mxf";
boost::filesystem::copy_file (
video,
boost::filesystem::copy_file (
video,
@@
-144,7
+145,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
film->make_dcp ();
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
film->make_dcp ();
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d_encrypted/original.mxf"));
A->set_key (film->key ());
shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d_encrypted/original.mxf"));
A->set_key (film->key ());