X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvideo_mxf_content_test.cc;h=5edb858820b1dbbae3dd58a1dd9b992a6535899d;hb=ac9f0b8c968f5bffc60a49ffb71a7c7a248f4e32;hp=f110062d1706833c34b0feedccf12efbba00b545;hpb=41262015eb2bb1fc3da8585883420975de381a65;p=dcpomatic.git

diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc
index f110062d1..5edb85882 100644
--- a/test/video_mxf_content_test.cc
+++ b/test/video_mxf_content_test.cc
@@ -26,22 +26,21 @@
 
 
 
-#include "lib/film.h"
-#include "lib/video_mxf_content.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content_type.h"
+#include "lib/film.h"
 #include "lib/ratio.h"
+#include "lib/video_mxf_content.h"
 #include "test.h"
 #include <dcp/mono_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 
 
-using std::make_shared;
-using std::shared_ptr;
 using std::dynamic_pointer_cast;
+using std::make_shared;
 
 
-static boost::filesystem::path ref_mxf = "test/data/scaling_test_185_185/j2c_74b946f4-1c33-4209-b639-b834de675eac.mxf";
+static boost::filesystem::path ref_mxf = "test/data/scaling_test_185_185/j2c_6a2ffab1-9ea5-4428-9027-9d458363c95f.mxf";
 
 
 static void note (dcp::NoteType, std::string)
@@ -58,12 +57,18 @@ BOOST_AUTO_TEST_CASE (video_mxf_content_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name ("video_mxf_content_test");
 
-	auto content = content_factory(ref_mxf).front();
+	auto content = content_factory(ref_mxf)[0];
 	auto check = dynamic_pointer_cast<VideoMXFContent> (content);
 	BOOST_REQUIRE (check);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	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,
+			dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K
+		});
 
 	auto ref = make_shared<dcp::MonoPictureAsset>(ref_mxf);
 	boost::filesystem::directory_iterator i ("build/test/video_mxf_content_test/video");