From: Carl Hetherington Date: Wed, 20 Mar 2024 22:21:25 +0000 (+0100) Subject: Bump asdcplib to dcpomatic-2.13.0 branch. X-Git-Tag: v1.9.4 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=refs%2Ftags%2Fv1.9.4;p=libdcp.git Bump asdcplib to dcpomatic-2.13.0 branch. --- diff --git a/benchmark/wscript b/benchmark/wscript index 7097a762..f3e2d660 100644 --- a/benchmark/wscript +++ b/benchmark/wscript @@ -35,7 +35,7 @@ def build(bld): for p in ['rgb_to_xyz', 'j2k_transcode']: obj = bld(features='cxx cxxprogram') obj.name = p - obj.uselib = 'BOOST_FILESYSTEM ASDCPLIB_CTH CXML' + obj.uselib = 'BOOST_FILESYSTEM ASDCPLIB_DCPOMATIC CXML' obj.cppflags = ['-g', '-O2'] obj.use = 'libdcp%s' % bld.env.API_VERSION obj.source = "%s.cc" % p diff --git a/cscript b/cscript index 7ab2773e..e09396f5 100644 --- a/cscript +++ b/cscript @@ -38,7 +38,7 @@ def dependencies(target, options): return ( ('libcxml', 'v0.17.8', options), ('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e'), - ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f') + ('asdcplib', '4b5d6e8d27dfd5fb282590538068662f4dbbf1c9') ) def build(target, options): diff --git a/examples/wscript b/examples/wscript index d062af1b..faaa3e9a 100644 --- a/examples/wscript +++ b/examples/wscript @@ -21,7 +21,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = example obj.use = 'libdcp%s' % bld.env.API_VERSION - obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM OPENSSL XMLSEC1 MAGICK' + obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_DCPOMATIC BOOST_FILESYSTEM OPENSSL XMLSEC1 MAGICK' obj.source = example + '.cc' obj.target = example obj.install_path = '' diff --git a/libdcp-1.0.pc.in b/libdcp-1.0.pc.in index 84fd39ce..b838487e 100644 --- a/libdcp-1.0.pc.in +++ b/libdcp-1.0.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@ Name: libdcp Description: DCP reading and writing library Version: @version@ -Requires: openssl libxml++-@xmlpp_api@ xmlsec1 libasdcp-carl xerces-c +Requires: openssl libxml++-@xmlpp_api@ xmlsec1 libasdcp-dcpomatic xerces-c Libs: @libs@ Cflags: -I${includedir} diff --git a/src/asset_factory.cc b/src/asset_factory.cc index be4f6b49..9eb42c8b 100644 --- a/src/asset_factory.cc +++ b/src/asset_factory.cc @@ -61,7 +61,8 @@ dcp::asset_factory (boost::filesystem::path path, bool ignore_incorrect_picture_ */ ASDCP::EssenceType_t type; - auto const result = ASDCP::EssenceType(dcp::filesystem::fix_long_path(path).string().c_str(), type); + Kumu::FileReaderFactory factory; + auto const result = ASDCP::EssenceType(dcp::filesystem::fix_long_path(path).string().c_str(), type, factory); if (!ASDCP_SUCCESS(result)) { throw ReadError(String::compose("Could not find essence type (%1)", result.Message()), path.string()); } diff --git a/src/asset_reader.h b/src/asset_reader.h index c8953e09..aa815745 100644 --- a/src/asset_reader.h +++ b/src/asset_reader.h @@ -97,7 +97,8 @@ private: explicit AssetReader (Asset const * asset, boost::optional key, Standard standard) : _crypto_context (new DecryptionContext(key, standard)) { - _reader = new R (); + Kumu::FileReaderFactory factory; + _reader = new R(factory); DCP_ASSERT (asset->file()); auto const r = _reader->OpenRead(dcp::filesystem::fix_long_path(*asset->file()).string().c_str()); if (ASDCP_FAILURE(r)) { diff --git a/src/atmos_asset.cc b/src/atmos_asset.cc index 42a0774e..09a22c1e 100644 --- a/src/atmos_asset.cc +++ b/src/atmos_asset.cc @@ -42,6 +42,7 @@ #include "atmos_asset_writer.h" #include "exceptions.h" #include +#include using std::string; @@ -67,7 +68,8 @@ AtmosAsset::AtmosAsset (boost::filesystem::path file) : Asset (file) , MXF (Standard::SMPTE) { - ASDCP::ATMOS::MXFReader reader; + Kumu::FileReaderFactory factory; + ASDCP::ATMOS::MXFReader reader(factory); auto r = reader.OpenRead(dcp::filesystem::fix_long_path(file).string().c_str()); if (ASDCP_FAILURE (r)) { boost::throw_exception (MXFFileError("could not open MXF file for reading", file.string(), r)); diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc index a72fd7d4..9a0beb42 100644 --- a/src/mono_picture_asset.cc +++ b/src/mono_picture_asset.cc @@ -66,7 +66,8 @@ using namespace dcp; MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file) : PictureAsset (file) { - ASDCP::JP2K::MXFReader reader; + Kumu::FileReaderFactory factory; + ASDCP::JP2K::MXFReader reader(factory); auto r = reader.OpenRead(dcp::filesystem::fix_long_path(file).string().c_str()); if (ASDCP_FAILURE(r)) { boost::throw_exception (MXFFileError("could not open MXF file for reading", file.string(), r)); @@ -109,14 +110,15 @@ MonoPictureAsset::equals(shared_ptr other, EqualityOptions const& o return false; } - ASDCP::JP2K::MXFReader reader_A; + Kumu::FileReaderFactory factory; + ASDCP::JP2K::MXFReader reader_A(factory); DCP_ASSERT (_file); auto r = reader_A.OpenRead(dcp::filesystem::fix_long_path(*_file).string().c_str()); if (ASDCP_FAILURE(r)) { boost::throw_exception (MXFFileError("could not open MXF file for reading", _file->string(), r)); } - ASDCP::JP2K::MXFReader reader_B; + ASDCP::JP2K::MXFReader reader_B(factory); DCP_ASSERT (other->file ()); r = reader_B.OpenRead(dcp::filesystem::fix_long_path(*other->file()).string().c_str()); if (ASDCP_FAILURE (r)) { diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc index 06c91c0b..4f611583 100644 --- a/src/smpte_subtitle_asset.cc +++ b/src/smpte_subtitle_asset.cc @@ -95,7 +95,8 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file) { auto xml = make_shared("SubtitleReel"); - auto reader = make_shared(); + Kumu::FileReaderFactory factory; + auto reader = make_shared(factory); auto r = Kumu::RESULT_OK; { ASDCPErrorSuspender sus; @@ -320,7 +321,8 @@ SMPTESubtitleAsset::set_key (Key key) /* Our data was encrypted; now we can decrypt it */ - auto reader = make_shared(); + Kumu::FileReaderFactory factory; + auto reader = make_shared(factory); auto r = reader->OpenRead(dcp::filesystem::fix_long_path(*_file).string().c_str()); if (ASDCP_FAILURE (r)) { boost::throw_exception ( @@ -354,7 +356,8 @@ SMPTESubtitleAsset::load_font_nodes () const bool SMPTESubtitleAsset::valid_mxf (boost::filesystem::path file) { - ASDCP::TimedText::MXFReader reader; + Kumu::FileReaderFactory factory; + ASDCP::TimedText::MXFReader reader(factory); Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL); auto r = reader.OpenRead(dcp::filesystem::fix_long_path(file).string().c_str()); Kumu::DefaultLogSink().SetFilterFlag(Kumu::LOG_ALLOW_ALL); diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 0ceba53d..90075278 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -70,7 +70,8 @@ using namespace dcp; SoundAsset::SoundAsset (boost::filesystem::path file) : Asset (file) { - ASDCP::PCM::MXFReader reader; + Kumu::FileReaderFactory factory; + ASDCP::PCM::MXFReader reader(factory); auto r = reader.OpenRead(dcp::filesystem::fix_long_path(file).string().c_str()); if (ASDCP_FAILURE(r)) { boost::throw_exception (MXFFileError("could not open MXF file for reading", file.string(), r)); @@ -138,14 +139,15 @@ SoundAsset::equals(shared_ptr other, EqualityOptions const& opt, No return true; } - ASDCP::PCM::MXFReader reader_A; + Kumu::FileReaderFactory factory; + ASDCP::PCM::MXFReader reader_A(factory); DCP_ASSERT (file()); auto r = reader_A.OpenRead(dcp::filesystem::fix_long_path(*file()).string().c_str()); if (ASDCP_FAILURE(r)) { boost::throw_exception (MXFFileError("could not open MXF file for reading", file()->string(), r)); } - ASDCP::PCM::MXFReader reader_B; + ASDCP::PCM::MXFReader reader_B(factory); r = reader_B.OpenRead(dcp::filesystem::fix_long_path(*other->file()).string().c_str()); if (ASDCP_FAILURE (r)) { boost::throw_exception (MXFFileError("could not open MXF file for reading", other->file()->string(), r)); @@ -278,7 +280,8 @@ SoundAsset::static_pkl_type (Standard standard) bool SoundAsset::valid_mxf (boost::filesystem::path file) { - ASDCP::PCM::MXFReader reader; + Kumu::FileReaderFactory factory; + ASDCP::PCM::MXFReader reader(factory); Kumu::Result_t r = reader.OpenRead(dcp::filesystem::fix_long_path(file).string().c_str()); return !ASDCP_FAILURE (r); } diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc index 2ce3cdc9..687d8572 100644 --- a/src/stereo_picture_asset.cc +++ b/src/stereo_picture_asset.cc @@ -59,7 +59,8 @@ using namespace dcp; StereoPictureAsset::StereoPictureAsset (boost::filesystem::path file) : PictureAsset (file) { - ASDCP::JP2K::MXFSReader reader; + Kumu::FileReaderFactory factory; + ASDCP::JP2K::MXFSReader reader(factory); auto r = reader.OpenRead(dcp::filesystem::fix_long_path(file).string().c_str()); if (ASDCP_FAILURE(r)) { boost::throw_exception (MXFFileError("could not open MXF file for reading", file.string(), r)); @@ -105,14 +106,15 @@ StereoPictureAsset::start_read () const bool StereoPictureAsset::equals(shared_ptr other, EqualityOptions const& opt, NoteHandler note) const { - ASDCP::JP2K::MXFSReader reader_A; + Kumu::FileReaderFactory factory; + ASDCP::JP2K::MXFSReader reader_A(factory); DCP_ASSERT (file()); auto r = reader_A.OpenRead(dcp::filesystem::fix_long_path(*file()).string().c_str()); if (ASDCP_FAILURE (r)) { boost::throw_exception (MXFFileError ("could not open MXF file for reading", file()->string(), r)); } - ASDCP::JP2K::MXFSReader reader_B; + ASDCP::JP2K::MXFSReader reader_B(factory); DCP_ASSERT (other->file()); r = reader_B.OpenRead(dcp::filesystem::fix_long_path(*other->file()).string().c_str()); if (ASDCP_FAILURE (r)) { diff --git a/src/wscript b/src/wscript index c2d499c8..29eb37ab 100644 --- a/src/wscript +++ b/src/wscript @@ -244,7 +244,7 @@ def build(bld): obj.name = 'libdcp%s' % bld.env.API_VERSION obj.target = 'dcp%s' % bld.env.API_VERSION obj.export_includes = ['.'] - obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_CTH XERCES' + obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_DCPOMATIC XERCES' obj.source = source # Library for gcov @@ -256,7 +256,7 @@ def build(bld): obj.name = 'libdcp%s_gcov' % bld.env.API_VERSION obj.target = 'dcp%s_gcov' % bld.env.API_VERSION obj.export_includes = ['.'] - obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_CTH XERCES' + obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1 ASDCPLIB_DCPOMATIC XERCES' obj.use = 'libkumu-libdcp%s libasdcp-libdcp%s' % (bld.env.API_VERSION, bld.env.API_VERSION) obj.source = source obj.cppflags = ['-fprofile-arcs', '-ftest-coverage', '-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0'] diff --git a/test/mca_test.cc b/test/mca_test.cc index bdfc9484..1cd95732 100644 --- a/test/mca_test.cc +++ b/test/mca_test.cc @@ -168,7 +168,8 @@ check_mca_descriptors(int suffix, vector extra_active_channels, ve /* Check MXF */ - auto reader = new ASDCP::PCM::MXFReader(); + Kumu::FileReaderFactory factory; + auto reader = new ASDCP::PCM::MXFReader(factory); reader->OpenRead(boost::filesystem::path(dir / "mxf.mxf").string()); list channels; diff --git a/test/ref/DCP/dcp_test1/audio.mxf b/test/ref/DCP/dcp_test1/audio.mxf index 5e08f74f..1f5f7987 100644 Binary files a/test/ref/DCP/dcp_test1/audio.mxf and b/test/ref/DCP/dcp_test1/audio.mxf differ diff --git a/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml index b239661b..26d41070 100644 --- a/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml +++ b/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -37,7 +37,7 @@ 24 0 24 - 7a4KZ9j2kpSuBz+iBQD4f03ctm8= + vsVjRV9vhTBPUWfE/TT1o2vdQsI= 24 1 1998 1080 @@ -47,7 +47,7 @@ 24 0 24 - KcJb7S2K5cNm8RG4kfQD5FTeS0A= + 3M7YTgvFKXXMEGLkIbV4miC90FE= urn:uuid:dd015243-ab77-435c-a13d-690566885121 diff --git a/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml index 71cae6ff..6a1392f3 100644 --- a/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml +++ b/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml @@ -9,7 +9,7 @@ urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab 6affb8ee-0020-4dff-a53c-17652f6358ab - 2DSYFM8X5sGdsYgzhs3mBbTNNmw= + skI+5b/9LA/y6h0mcyxysJYanxI= 8559 text/xml cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -17,7 +17,7 @@ urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 5407b210-4441-4e97-8b16-8bdc7c12da54 - 7a4KZ9j2kpSuBz+iBQD4f03ctm8= + vsVjRV9vhTBPUWfE/TT1o2vdQsI= 31648 application/mxf video.mxf @@ -25,7 +25,7 @@ urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa 97f0f352-5b77-48ee-a558-9df37717f4fa - KcJb7S2K5cNm8RG4kfQD5FTeS0A= + 3M7YTgvFKXXMEGLkIbV4miC90FE= 881326 application/mxf audio.mxf diff --git a/test/ref/DCP/dcp_test1/video.mxf b/test/ref/DCP/dcp_test1/video.mxf index eac7acea..cd0e43af 100644 Binary files a/test/ref/DCP/dcp_test1/video.mxf and b/test/ref/DCP/dcp_test1/video.mxf differ diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf index e8bd446f..6a95baf3 100644 Binary files a/test/ref/DCP/dcp_test2/audio.mxf and b/test/ref/DCP/dcp_test2/audio.mxf differ diff --git a/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml index 52a7779a..0e233325 100644 --- a/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml +++ b/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -22,7 +22,7 @@ 24 0 24 - NzWhEbTccUIh1sSXIbU+8POVui0= + X+4lOvviLTQeP28hyzhCOGjraiE= urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 @@ -30,7 +30,7 @@ 24 0 24 - BUpeFS6X9j+X0z2TZWSsLMT4pE0= + dU+tcR6bZ5BQ/TXKtBY03ejjUmc= 48 1 1998 1080 diff --git a/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml b/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml index 061e8a6a..794cfb85 100644 --- a/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml +++ b/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml @@ -9,7 +9,7 @@ urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab 6affb8ee-0020-4dff-a53c-17652f6358ab - zaAcrAcv0oOzOa3etTP6xDfzQko= + 2jp5+JDLOh5CqzQ8goZTzBEWsPo= 1686 text/xml cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -17,7 +17,7 @@ urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 5407b210-4441-4e97-8b16-8bdc7c12da54 - BUpeFS6X9j+X0z2TZWSsLMT4pE0= + dU+tcR6bZ5BQ/TXKtBY03ejjUmc= 63160 application/mxf video.mxf @@ -25,7 +25,7 @@ urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d fc843acc-1ad9-4808-b9ed-33f5319e047d - NzWhEbTccUIh1sSXIbU+8POVui0= + X+4lOvviLTQeP28hyzhCOGjraiE= 161326 application/mxf audio.mxf diff --git a/test/ref/DCP/dcp_test2/video.mxf b/test/ref/DCP/dcp_test2/video.mxf index 3b670708..6200297c 100644 Binary files a/test/ref/DCP/dcp_test2/video.mxf and b/test/ref/DCP/dcp_test2/video.mxf differ diff --git a/test/ref/DCP/dcp_test5/audio.mxf b/test/ref/DCP/dcp_test5/audio.mxf index 947865e1..fc55b975 100644 Binary files a/test/ref/DCP/dcp_test5/audio.mxf and b/test/ref/DCP/dcp_test5/audio.mxf differ diff --git a/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml index 5fa3643b..0dbd0198 100644 --- a/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml +++ b/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -22,7 +22,7 @@ 24 0 24 - o3VmpdFsNUgF11oadcaGJ/IfO0M= + w7xIWU3Q+QnEQMq7BcOhsWO+OU0= 24 1 1998 1080 @@ -32,7 +32,7 @@ 24 0 24 - l+XLgxe2fMZDgY+0QYzDfGhvTQM= + 5ANfi1KoyGiZ8hQIhDHm5f/OvQY= urn:uuid:b68febcc-5ddf-489a-84a7-924f29fa2afd diff --git a/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml b/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml index 49fd579b..e9b1e802 100644 --- a/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml +++ b/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml @@ -9,7 +9,7 @@ urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab 6affb8ee-0020-4dff-a53c-17652f6358ab - eqEIVxSAbJL+SROmqrDHbr9sb+A= + 4zHV3/AhGYo5WjNmyuxeRSPOVwk= 2024 text/xml cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -17,7 +17,7 @@ urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 5407b210-4441-4e97-8b16-8bdc7c12da54 - o3VmpdFsNUgF11oadcaGJ/IfO0M= + w7xIWU3Q+QnEQMq7BcOhsWO+OU0= 40144 application/mxf video.mxf @@ -25,7 +25,7 @@ urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa 97f0f352-5b77-48ee-a558-9df37717f4fa - l+XLgxe2fMZDgY+0QYzDfGhvTQM= + 5ANfi1KoyGiZ8hQIhDHm5f/OvQY= 161326 application/mxf audio.mxf diff --git a/test/ref/DCP/dcp_test5/video.mxf b/test/ref/DCP/dcp_test5/video.mxf index f3e7588b..3ec65a51 100644 Binary files a/test/ref/DCP/dcp_test5/video.mxf and b/test/ref/DCP/dcp_test5/video.mxf differ diff --git a/test/ref/DCP/dcp_test7/audio.mxf b/test/ref/DCP/dcp_test7/audio.mxf index 5e08f74f..1f5f7987 100644 Binary files a/test/ref/DCP/dcp_test7/audio.mxf and b/test/ref/DCP/dcp_test7/audio.mxf differ diff --git a/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml index 42f09109..13aecd8a 100644 --- a/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml +++ b/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -37,7 +37,7 @@ 24 0 24 - 7a4KZ9j2kpSuBz+iBQD4f03ctm8= + vsVjRV9vhTBPUWfE/TT1o2vdQsI= 24 1 1.85 @@ -47,7 +47,7 @@ 24 0 24 - KcJb7S2K5cNm8RG4kfQD5FTeS0A= + 3M7YTgvFKXXMEGLkIbV4miC90FE= diff --git a/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml index f4eea4ee..9d251109 100644 --- a/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml +++ b/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml @@ -9,7 +9,7 @@ urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab 6affb8ee-0020-4dff-a53c-17652f6358ab - z9r7fpZ4wf0GbiliDzpfKQvFkmo= + SgCEvehTaji0MCWOJTVioOcNndY= 1965 text/xml;asdcpKind=CPL cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -17,7 +17,7 @@ urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54 5407b210-4441-4e97-8b16-8bdc7c12da54 - 7a4KZ9j2kpSuBz+iBQD4f03ctm8= + vsVjRV9vhTBPUWfE/TT1o2vdQsI= 31648 application/x-smpte-mxf;asdcpKind=Picture video.mxf @@ -25,7 +25,7 @@ urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa 97f0f352-5b77-48ee-a558-9df37717f4fa - KcJb7S2K5cNm8RG4kfQD5FTeS0A= + 3M7YTgvFKXXMEGLkIbV4miC90FE= 881326 application/x-smpte-mxf;asdcpKind=Sound audio.mxf diff --git a/test/ref/DCP/dcp_test7/video.mxf b/test/ref/DCP/dcp_test7/video.mxf index eac7acea..cd0e43af 100644 Binary files a/test/ref/DCP/dcp_test7/video.mxf and b/test/ref/DCP/dcp_test7/video.mxf differ diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf index a4f89ae9..505b7f13 100644 Binary files a/test/ref/DCP/encryption_test/audio.mxf and b/test/ref/DCP/encryption_test/audio.mxf differ diff --git a/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml index e8e24467..6203c884 100644 --- a/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml +++ b/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -23,7 +23,7 @@ 0 24 urn:uuid:ac8d301c-e5d9-4343-b6f3-ba2668adbe56 - AVtX8wz76uG2Uw0Qbc9+DKnHUfw= + Q0GMntXvEqVQsiv+YkfhMrXdw0w= 24 1 1998 1080 @@ -34,7 +34,7 @@ 0 24 urn:uuid:7ab6c77b-6648-44b9-8549-a5290ada6238 - 3o02UpYqrl6w0NQbFvrB2tKxaIk= + v0SCdh2xnKNzGC7Sk5pS2q5Q/wQ= @@ -57,15 +57,15 @@ - X3YkODMLyEJsAz5v3S/uT+xDD7c= + DBBENxFb5Qv377fb86n0KgUQ7go= - jH02vGxlTTi9T94KCIfMkafmdO0wluP9cvh+u5HyYoZo/D7O1Ki202t5uHRp0wcu -OfBFuu1Hw3Ooy/VEa2l4l/UDfE7lI+D79e0VfA8HwFB+c21GF7Q2FRV5ddu9ODgz -rk6kC5fZSLxc7cpK6jPNnT285O3nHfjk6MQ0fgGfNbvMefgeEWVKj8qcyFgN6H4e -wr1omcjbdw/HVQaOW84//pBRSRdMJGe1u2iUE2RwxBLzP4BepzkMv9Asm6uDo1YG -X1d60g2aCUdxAg9fjyTaOss1nRp1YdPlb3SHUhKXgTT/eAPkmmr7bs3jJtp2BN9U -4Izz2GR/3Uyf0NP20mZgNQ== + rhF1QacGUhxm1jfcgyBjAo2BmD4QxBl7c6Bzt8rjXXhR+NVT4ITeyxi39+94WwBx +Yp8iQhF46bE2QGZAr+HnZZJGVG3ajeaQ4uvPp2KRC8sHpBlZ2rGGtyjXAflYjepw +c1cLvRoAKbxOMW+ESxjyYOKgT0Bke0GhbzZ8+w+hGZLHxK9oTokIG9YDnRNUKN5W +n6avbxuaT8wtZgVwD4qfKzMeJlYW3yDFo/2apQA5K+oCj/gfrS1habYqBoNo9kO1 +fWkQ7LIeRrYuzNlr5K4e/LyIm7SHwb9EGcA7K8WbDrHKvaJmTs/T01QhU9f+huk2 +ZGJMMCGHhiwcbVtqVhgJSQ== diff --git a/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml b/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml index 4d49b259..fb0313ab 100644 --- a/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml +++ b/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml @@ -9,7 +9,7 @@ urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab 6affb8ee-0020-4dff-a53c-17652f6358ab - Zd9zaFAGx/4W2B3vSZkAqTzcDZ0= + sLWF9OcgdkvBUH1VcNiwseLA3sA= 9226 text/xml cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml @@ -17,7 +17,7 @@ urn:uuid:9a7fbb03-4078-4944-90b1-0d8a21c9d793 9a7fbb03-4078-4944-90b1-0d8a21c9d793 - AVtX8wz76uG2Uw0Qbc9+DKnHUfw= + Q0GMntXvEqVQsiv+YkfhMrXdw0w= 44008 application/mxf video.mxf @@ -25,7 +25,7 @@ urn:uuid:ce300880-a425-40a6-adac-eb1e3f5643fc ce300880-a425-40a6-adac-eb1e3f5643fc - 3o02UpYqrl6w0NQbFvrB2tKxaIk= + v0SCdh2xnKNzGC7Sk5pS2q5Q/wQ= 165454 application/mxf audio.mxf @@ -49,15 +49,15 @@ - 0F1ZXfoRDPIQHlRG0MC1uXkahG8= + OU1UpJxBmpxK8SE5yfe8aJsqoIw= - u98MLscN/Fn3YxGFMw6kP7fIWUj05FPxQvIYvsIpP68UP3FX9rdP6nh3Olyv194d -A1fQJu4ZamTcYN2O2E5vdGjxxHlPNXfFPckWc9Sy1i3V8u+EFdOggjMY4snvPot6 -kMyzAICuKzTJs4l+O/BzJAJSFSxrEtBCYEFxrtyKntDxSUE7ePSqPwcim6+5BzDO -QOsIp3wjJHlp7u4QqU3knIiaM7SibIXqtIBF7TOrChWZjFImKePNib9/DXvnE2WL -Y+5wJjGhImQR+2U2DDpSCLkl0kVgDrYfKcNg4lXUDZGEKo0Yqz0+1Rszz/DqsC+J -6mYxqMMvRXeh9pViSpgKaA== + ypg6tt5iJi7YEUJQfEQmZeigXzcm2xn/J59tqqYBqwmAch1ia//Khyo6m7/HpQJl +2Y5swUI8MtmzdV3gj3urd8WuQsDWFLflIHHiIanYE/XCdFZ8lV/nvyCkAaf/AH2V +W7bWD8/fYXJD2G9a2tRiWTjzfgpsTk+ox+C12Y/SebWAQ97sSLIMwwmQIYK2kTnh +nbKSuhk+v+V2ObpYl48zXu3za3Yt77rCdcGgPwYr/NUI47ascpnueNw48clDtjp+ +775jeA5ZG5lBR3VGTLwvoOXT3CH/FgG0DPSLmYbRnOzEShVUt7xFgbxMgNTYOGQJ +3ipS6qmHgWHjX3/fo6isgg== diff --git a/test/ref/DCP/encryption_test/video.mxf b/test/ref/DCP/encryption_test/video.mxf index 2fbfacdd..e6ddbadb 100644 Binary files a/test/ref/DCP/encryption_test/video.mxf and b/test/ref/DCP/encryption_test/video.mxf differ diff --git a/test/test.cc b/test/test.cc index 6a359aeb..497120d4 100644 --- a/test/test.cc +++ b/test/test.cc @@ -260,14 +260,14 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check) RNGFixer::RNGFixer () { - Kumu::cth_test = true; + Kumu::dcpomatic_test = true; Kumu::FortunaRNG().Reset(); } RNGFixer::~RNGFixer () { - Kumu::cth_test = false; + Kumu::dcpomatic_test = false; } diff --git a/test/verify_test.cc b/test/verify_test.cc index b6d0ac1e..34707b1f 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -356,16 +356,16 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_picture_sound_hash) HashCalculator video_calc(video_path); auto mod = fopen(video_path.string().c_str(), "r+b"); BOOST_REQUIRE (mod); - fseek (mod, 4096, SEEK_SET); + BOOST_REQUIRE_EQUAL(fseek(mod, -16, SEEK_END), 0); int x = 42; - fwrite (&x, sizeof(x), 1, mod); + BOOST_REQUIRE(fwrite(&x, sizeof(x), 1, mod) == 1); fclose (mod); auto audio_path = path(dir / "audio.mxf"); HashCalculator audio_calc(audio_path); mod = fopen(audio_path.string().c_str(), "r+b"); BOOST_REQUIRE (mod); - BOOST_REQUIRE_EQUAL (fseek(mod, -64, SEEK_END), 0); + BOOST_REQUIRE_EQUAL(fseek(mod, 0, SEEK_END), 0); BOOST_REQUIRE (fwrite (&x, sizeof(x), 1, mod) == 1); fclose (mod); @@ -406,9 +406,9 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_picture_sound_hashes) ).set_reference_hash("x" + calc.old_hash()).set_calculated_hash(calc.old_hash()), { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf") }, { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf") }, - { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xKcJb7S2K5cNm8RG4kfQD5FTeS0A=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 28 }, - { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'x2DSYFM8X5sGdsYgzhs3mBbTNNmw=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 12 }, - { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'x7a4KZ9j2kpSuBz+iBQD4f03ctm8=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 20 }, + { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'x3M7YTgvFKXXMEGLkIbV4miC90FE=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 28 }, + { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xskI+5b/9LA/y6h0mcyxysJYanxI=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 12 }, + { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xvsVjRV9vhTBPUWfE/TT1o2vdQsI=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 20 }, }); } @@ -1503,7 +1503,7 @@ verify_timed_text_asset_too_large (string name) { dir }, {}, { - { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121695488"), canonical(dir / "subs.mxf") }, + { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121698284"), canonical(dir / "subs.mxf") }, { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, string("121634816"), canonical(dir / "subs.mxf") }, { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") }, { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }, diff --git a/test/wscript b/test/wscript index d2cac0b3..e401f720 100644 --- a/test/wscript +++ b/test/wscript @@ -53,7 +53,7 @@ def configure(conf): def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'tests' - obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL XERCES DL' + obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_DCPOMATIC LIBXML++ OPENSSL XERCES DL' obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0'] if bld.env['CXX_NAME'] == 'gcc': obj.cppflags.append('-fno-default-inline') @@ -123,7 +123,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'subs_in_out' - obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL DL LIBXML++' + obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_DCPOMATIC XMLSEC1 OPENSSL DL LIBXML++' obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0'] if bld.env['CXX_NAME'] == 'gcc': obj.cppflags.append('-fno-default-inline') @@ -140,7 +140,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'rewrite_subs' - obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL DL LIBXML++' + obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_DCPOMATIC XMLSEC1 OPENSSL DL LIBXML++' obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0'] if bld.env['CXX_NAME'] == 'gcc': obj.cppflags.append('-fno-default-inline') diff --git a/tools/wscript b/tools/wscript index 3ee04e94..53b74e70 100644 --- a/tools/wscript +++ b/tools/wscript @@ -32,7 +32,7 @@ # def build(bld): - uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES DL MAGICK' + uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_DCPOMATIC BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES DL MAGICK' for f in ['diff', 'info', 'verify']: obj = bld(features='cxx cxxprogram') diff --git a/wscript b/wscript index 8960553d..d48e7135 100644 --- a/wscript +++ b/wscript @@ -59,7 +59,7 @@ def options(opt): opt.add_option('--target-windows-64', action='store_true', default=False, help='set up to do a cross-compile to Windows 64-bit') opt.add_option('--target-windows-32', action='store_true', default=False, help='set up to do a cross-compile to Windows 32-bit') opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') - opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-carl') + opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-dcpomatic') opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') opt.add_option('--disable-benchmarks', action='store_true', default=False, help='disable building of benchmarks') opt.add_option('--enable-gcov', action='store_true', default=False, help='use gcov in tests') @@ -166,16 +166,16 @@ def configure(conf): if conf.options.static: conf.env.STLIB_OPENJPEG = ['openjp2'] - conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) - conf.env.HAVE_ASDCPLIB_CTH = 1 - conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-carl', 'kumu-carl'] + conf.check_cfg(package='libasdcp-dcpomatic', args='libasdcp-dcpomatic >= 0.1.3 --cflags', uselib_store='ASDCPLIB_DCPOMATIC', mandatory=True) + conf.env.HAVE_ASDCPLIB_DCPOMATIC = 1 + conf.env.STLIB_ASDCPLIB_DCPOMATIC = ['asdcp-dcpomatic', 'kumu-dcpomatic'] conf.env.HAVE_CXML = 1 conf.env.LIB_CXML = ['xml++-' + conf.env.XMLPP_API, 'glibmm-2.4'] conf.env.STLIB_CXML = ['cxml'] conf.check_cfg(package='xerces-c', args='--cflags', uselib_store='XERCES', mandatory=True) conf.env.LIB_XERCES = ['xerces-c', 'icuuc', 'curl'] else: - conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.check_cfg(package='libasdcp-dcpomatic', args='libasdcp-dcpomatic >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_DCPOMATIC', mandatory=True) conf.check_cfg(package='libcxml', args='libcxml >= 0.17.0 --cflags --libs', uselib_store='CXML', mandatory=True) conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True)