projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7f33687
)
fixup! WIP: stop using video directory and hard-linking (#2756).
author
Carl Hetherington
<cth@carlh.net>
Wed, 3 Apr 2024 22:17:40 +0000
(
00:17
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 3 Apr 2024 22:17:40 +0000
(
00:17
+0200)
test/recover_test.cc
patch
|
blob
|
history
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index 63c611831ea69b98fbc273a3f1ed55f55e966349..d797b6bdedb35481dfaad79c84a96e1e87ade5e9 100644
(file)
--- a/
test/recover_test.cc
+++ b/
test/recover_test.cc
@@
-75,13
+75,16
@@
BOOST_AUTO_TEST_CASE (recover_test_2d)
dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
});
dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
});
- boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_4650f318cea570763a0c6411c8c098ce_24_100000000_P_S_L21_0_1200000.mxf";
+ auto video = [film]() {
+ return find_file(boost::filesystem::path("build/test/recover_test_2d") / film->dcp_name(false), "j2c_");
+ };
+
boost::filesystem::copy_file (
boost::filesystem::copy_file (
- video,
+ video
()
,
"build/test/recover_test_2d/original.mxf"
);
"build/test/recover_test_2d/original.mxf"
);
- boost::filesystem::resize_file
(video
, 2 * 1024 * 1024);
+ boost::filesystem::resize_file
(video()
, 2 * 1024 * 1024);
make_and_verify_dcp(
film,
make_and_verify_dcp(
film,
@@
-95,7
+98,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d)
);
auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d/original.mxf");
);
auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d/original.mxf");
- auto B = make_shared<dcp::MonoPictureAsset>(video);
+ auto B = make_shared<dcp::MonoPictureAsset>(video
()
);
dcp::EqualityOptions eq;
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
dcp::EqualityOptions eq;
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
@@
-118,14
+121,16
@@
BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE });
make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE });
- boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_60a75a531ca9546bdd513163117e2214_24_100000000_P_S_L21_3D_0_96000.mxf";
+ auto video = [film]() {
+ return find_file(boost::filesystem::path("build/test/recover_test_3d") / film->dcp_name(false), "j2c_");
+ };
boost::filesystem::copy_file (
boost::filesystem::copy_file (
- video,
+ video
()
,
"build/test/recover_test_3d/original.mxf"
);
"build/test/recover_test_3d/original.mxf"
);
- boost::filesystem::resize_file
(video
, 2 * 1024 * 1024);
+ boost::filesystem::resize_file
(video()
, 2 * 1024 * 1024);
make_and_verify_dcp(
film,
make_and_verify_dcp(
film,
@@
-138,7
+143,7
@@
BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
);
auto A = make_shared<dcp::StereoPictureAsset>("build/test/recover_test_3d/original.mxf");
);
auto A = make_shared<dcp::StereoPictureAsset>("build/test/recover_test_3d/original.mxf");
- auto B = make_shared<dcp::StereoPictureAsset>(video);
+ auto B = make_shared<dcp::StereoPictureAsset>(video
()
);
dcp::EqualityOptions eq;
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
dcp::EqualityOptions eq;
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
@@
-161,15
+166,16
@@
BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on(
make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE });
make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE });
- boost::filesystem::path const video =
- "build/test/recover_test_2d_encrypted/video/185_2K_4650f318cea570763a0c6411c8c098ce_24_100000000_Eeafcb91c9f5472edf01f3a2404c57258_S_L21_0_1200000.mxf";
+ auto video = [film]() {
+ return find_file(boost::filesystem::path("build/test/recover_test_2d_encrypted") / film->dcp_name(false), "j2c_");
+ };
boost::filesystem::copy_file (
boost::filesystem::copy_file (
- video,
+ video
()
,
"build/test/recover_test_2d_encrypted/original.mxf"
);
"build/test/recover_test_2d_encrypted/original.mxf"
);
- boost::filesystem::resize_file
(video
, 2 * 1024 * 1024);
+ boost::filesystem::resize_file
(video()
, 2 * 1024 * 1024);
make_and_verify_dcp(
film,
make_and_verify_dcp(
film,
@@
-183,7
+189,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on(
auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d_encrypted/original.mxf");
A->set_key (film->key ());
auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d_encrypted/original.mxf");
A->set_key (film->key ());
- auto B = make_shared<dcp::MonoPictureAsset>(video);
+ auto B = make_shared<dcp::MonoPictureAsset>(video
()
);
B->set_key (film->key ());
dcp::EqualityOptions eq;
B->set_key (film->key ());
dcp::EqualityOptions eq;