X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=38b8f36d47e009510fdd923d50c9ed8f17f9851a;hb=d3b5b533ebba1a1534eb37cc41032876a48a3d82;hp=698fcba0b50de8cf35f0b0392b01fc2d08104eaa;hpb=dfa7b94e802b05bba4243381460eef96626102a0;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 698fcba0b..38b8f36d4 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -42,8 +42,8 @@
 #include "lib/util.h"
 #include "lib/video_content.h"
 #include "test.h"
-#include <dcp/mono_picture_asset.h>
-#include <dcp/stereo_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -135,7 +135,13 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 	R->set_trim_end (dcpomatic::ContentTime::from_seconds(22));
 
 	film->set_three_d (true);
-	make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D});
+	make_and_verify_dcp(
+		film,
+		{dcp::VerificationNote::Code::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D},
+		true,
+		/* XXX: Clairmeta error about invalid edit rate 24 for 4K 3D */
+		false
+		);
 }
 
 
@@ -324,10 +330,10 @@ BOOST_AUTO_TEST_CASE(threed_passthrough_test, * boost::unit_test::depends_on("th
 
 	BOOST_REQUIRE_EQUAL(matches.size(), 1U);
 
-	auto stereo = dcp::StereoPictureAsset(matches[0]);
+	auto stereo = dcp::StereoJ2KPictureAsset(matches[0]);
 	auto stereo_reader = stereo.start_read();
 
-	auto mono = dcp::MonoPictureAsset(dcp_file(film, "j2c"));
+	auto mono = dcp::MonoJ2KPictureAsset(dcp_file(film, "j2c"));
 	auto mono_reader = mono.start_read();
 
 	BOOST_REQUIRE_EQUAL(stereo.intrinsic_duration(), mono.intrinsic_duration());