summaryrefslogtreecommitdiff
path: root/test/threed_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-04-22 21:39:03 +0200
committerCarl Hetherington <cth@carlh.net>2024-04-22 21:39:03 +0200
commit764c35279cf79e96a9d738ad86625bc3137fc8d7 (patch)
tree0f778d72bc5c8bb74dfbacd07ea570b15eaf28d7 /test/threed_test.cc
parenta046e7fedb6d6e6703e36999fc6b6183252f0438 (diff)
parentb74f594ce1dee47fdb5cbeebdc3d6577cdd1cab8 (diff)
Merge branch 'mpeg2' into v2.17.xv2.17.16
Diffstat (limited to 'test/threed_test.cc')
-rw-r--r--test/threed_test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 78d74add4..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>
@@ -330,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());