X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frecover_test.cc;h=017c019274af0b69254cd65331b1b6667118609c;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hp=98d52ef762fbf38585a5d33dda0b863328051733;hpb=b084aef4443929e14acf690f7c9e2378b80fb43f;p=dcpomatic.git

diff --git a/test/recover_test.cc b/test/recover_test.cc
index 98d52ef76..017c01927 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -20,6 +20,7 @@
 
 /** @file  test/recover_test.cc
  *  @brief Test recovery of a DCP transcode after a crash.
+ *  @ingroup specific
  */
 
 #include "test.h"
@@ -49,18 +50,19 @@ note (dcp::NoteType t, string n)
 BOOST_AUTO_TEST_CASE (recover_test_2d)
 {
 	shared_ptr<Film> film = new_test_film ("recover_test_2d");
+	film->set_interop (false);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	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);
 	wait_for_jobs ();
 
 	film->make_dcp ();
 	wait_for_jobs ();
 
-	boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_9284c41c42044ef9b4c14482730cdffe_24_100000000_P_S_0_1200000.mxf";
+	boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_84d36460538435d5d511ee533c8528df_24_100000000_P_S_0_1200000.mxf";
 	boost::filesystem::copy_file (
 		video,
 		"build/test/recover_test_2d/original.mxf"
@@ -81,12 +83,13 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
 BOOST_AUTO_TEST_CASE (recover_test_3d)
 {
 	shared_ptr<Film> film = new_test_film ("recover_test_3d");
+	film->set_interop (false);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	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);
 	wait_for_jobs ();
@@ -112,3 +115,42 @@ BOOST_AUTO_TEST_CASE (recover_test_3d)
 	dcp::EqualityOptions eq;
 	BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
 }
+
+
+BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
+{
+	shared_ptr<Film> film = new_test_film ("recover_test_2d_encrypted");
+	film->set_interop (false);
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
+	film->set_container (Ratio::from_id ("185"));
+	film->set_name ("recover_test");
+	film->set_encrypted (true);
+
+	shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
+	film->examine_and_add_content (content);
+	wait_for_jobs ();
+
+	film->make_dcp ();
+	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";
+
+	boost::filesystem::copy_file (
+		video,
+		"build/test/recover_test_2d_encrypted/original.mxf"
+		);
+
+	boost::filesystem::resize_file (video, 2 * 1024 * 1024);
+
+	film->make_dcp ();
+	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> B (new dcp::MonoPictureAsset (video));
+	B->set_key (film->key ());
+
+	dcp::EqualityOptions eq;
+	BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
+}