projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
test
/
recover_test.cc
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index 49948f12b5f1ebba1e97506dfa1468a901598e1c..aa8da8ba945a5b9406f32554adde3c4a68380b02 100644
(file)
--- a/
test/recover_test.cc
+++ b/
test/recover_test.cc
@@
-20,7
+20,7
@@
/** @file test/recover_test.cc
* @brief Test recovery of a DCP transcode after a crash.
/** @file test/recover_test.cc
* @brief Test recovery of a DCP transcode after a crash.
- * @ingroup
specific
+ * @ingroup
feature
*/
#include "test.h"
*/
#include "test.h"
@@
-37,7
+37,10
@@
using std::cout;
using std::string;
using std::cout;
using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
static void
note (dcp::NoteType t, string n)
static void
note (dcp::NoteType t, string n)
@@
-62,7
+65,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d)
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
film->make_dcp ();
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_
02543352c540f4b083bff3f1e309d4a9
_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"
@@
-97,7
+100,7
@@
BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
film->make_dcp ();
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_
70e6661af92ae94458784c16a21a9748
_24_100000000_P_S_3D_0_96000.mxf";
boost::filesystem::copy_file (
video,
boost::filesystem::copy_file (
video,
@@
-125,6
+128,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on(
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->_key = dcp::Key("eafcb91c9f5472edf01f3a2404c57258");
shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
film->examine_and_add_content (content);
shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
film->examine_and_add_content (content);
@@
-134,7
+138,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on(
BOOST_REQUIRE (!wait_for_jobs());
boost::filesystem::path const video =
BOOST_REQUIRE (!wait_for_jobs());
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_
02543352c540f4b083bff3f1e309d4a9_24_100000000_Eeafcb91c9f5472edf01f3a2404c57258
_S_0_1200000.mxf";
boost::filesystem::copy_file (
video,
boost::filesystem::copy_file (
video,