From eac3cac07eb97a6bcf6accd1575af76cd6f59112 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 28 Jan 2021 23:13:15 +0100 Subject: [PATCH] Don't use flat_red.j2c for the simple DCP test as it's only 8-bit. --- test/frame_info_hash_test.cc | 6 +++--- test/ref/DCP/dcp_test1/ASSETMAP.xml | 2 +- ...l_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 2 +- ...l_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml | 6 +++--- test/ref/DCP/dcp_test1/video.mxf | Bin 40144 -> 49240 bytes test/ref/DCP/dcp_test7/ASSETMAP | 2 +- ...l_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 2 +- ...l_63c3aece-c581-4603-b612-75e43f0c0430.xml | 6 +++--- test/ref/DCP/dcp_test7/video.mxf | Bin 40144 -> 49240 bytes test/ref/cpl_metadata_test1.xml | 2 +- test/ref/cpl_metadata_test2.xml | 2 +- test/test.cc | 11 +++++++++-- test/verify_test.cc | 6 +++--- 13 files changed, 27 insertions(+), 20 deletions(-) diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc index e24ab5aa..82e0f3ac 100644 --- a/test/frame_info_hash_test.cc +++ b/test/frame_info_hash_test.cc @@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (frame_info_hash_test) unsigned int seed = 42; /* Check a few random frames */ - check (&seed, writer, "c039c5a0e5d20bc646f7e9c10e2d5874"); - check (&seed, writer, "d9e694cfe84544c54a869c128ba39343"); - check (&seed, writer, "fafb05a0039cb9fc604279c90a13cb87"); + check (&seed, writer, "9da3d1d93a80683e65d996edae4101ed"); + check (&seed, writer, "ecd77b3fbf459591f24119d4118783fb"); + check (&seed, writer, "9f10303495b58ccb715c893d40127e22"); } diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml index e0426fb1..1e5c909b 100644 --- a/test/ref/DCP/dcp_test1/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml @@ -37,7 +37,7 @@ video.mxf 1 0 - 40144 + 49240 diff --git a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index 2ee11df5..fed09ab1 100644 --- a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -41,7 +41,7 @@ 24 0 24 - XGhFVrqZqapOJx5Fh2SLjj48Yjg= + addO7je2lZSNQp55qjCWo5DLKFQ= 24 1 1998 1080 diff --git a/test/ref/DCP/dcp_test1/pkl_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml b/test/ref/DCP/dcp_test1/pkl_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml index 5038b8ed..e2a28329 100644 --- a/test/ref/DCP/dcp_test1/pkl_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml +++ b/test/ref/DCP/dcp_test1/pkl_2b9b857f-ab4a-440e-a313-1ace0f1cfc95.xml @@ -9,15 +9,15 @@ urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b 81fb54df-e1bf-4647-8788-ea7ba154375b - xz+gUPoPMdbFlAewvWIq8BRhBmA= + X3bMCBdXEOYEpYmsConNWrWUAGs= 5082 text/xml urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 1fab8bb0-cfaf-4225-ad6d-01768bc10470 - XGhFVrqZqapOJx5Fh2SLjj48Yjg= - 40144 + addO7je2lZSNQp55qjCWo5DLKFQ= + 49240 application/mxf diff --git a/test/ref/DCP/dcp_test1/video.mxf b/test/ref/DCP/dcp_test1/video.mxf index 0a8fb0cab03c264d7ed5f12c3e4cd66b19a19b60..7042a71ac700e58c03615197173c31c480d85fe4 100644 GIT binary patch literal 49240 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 Bhadm| literal 40144 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 VZ35O}I+aE;h-W1U#PX5o{{U<2hwuOZ diff --git a/test/ref/DCP/dcp_test7/ASSETMAP b/test/ref/DCP/dcp_test7/ASSETMAP index a0a42801..58ef1279 100644 --- a/test/ref/DCP/dcp_test7/ASSETMAP +++ b/test/ref/DCP/dcp_test7/ASSETMAP @@ -37,7 +37,7 @@ video.mxf 1 0 - 40144 + 49240 diff --git a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml index a9ff202b..bb933d94 100644 --- a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml +++ b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -41,7 +41,7 @@ 24 0 24 - XGhFVrqZqapOJx5Fh2SLjj48Yjg= + addO7je2lZSNQp55qjCWo5DLKFQ= 24 1 1.85 diff --git a/test/ref/DCP/dcp_test7/pkl_63c3aece-c581-4603-b612-75e43f0c0430.xml b/test/ref/DCP/dcp_test7/pkl_63c3aece-c581-4603-b612-75e43f0c0430.xml index 919fe206..ae197d21 100644 --- a/test/ref/DCP/dcp_test7/pkl_63c3aece-c581-4603-b612-75e43f0c0430.xml +++ b/test/ref/DCP/dcp_test7/pkl_63c3aece-c581-4603-b612-75e43f0c0430.xml @@ -9,15 +9,15 @@ urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b 81fb54df-e1bf-4647-8788-ea7ba154375b - JxqfjtwuLuimdPydOWGY/Vgrzek= + 4a5qu1Q918HGMSi/b5d30ZvlkIo= 2168 text/xml;asdcpKind=CPL urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 1fab8bb0-cfaf-4225-ad6d-01768bc10470 - XGhFVrqZqapOJx5Fh2SLjj48Yjg= - 40144 + addO7je2lZSNQp55qjCWo5DLKFQ= + 49240 application/x-smpte-mxf;asdcpKind=Picture diff --git a/test/ref/DCP/dcp_test7/video.mxf b/test/ref/DCP/dcp_test7/video.mxf index 0a8fb0cab03c264d7ed5f12c3e4cd66b19a19b60..7042a71ac700e58c03615197173c31c480d85fe4 100644 GIT binary patch literal 49240 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 Bhadm| literal 40144 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 VZ35O}I+aE;h-W1U#PX5o{{U<2hwuOZ diff --git a/test/ref/cpl_metadata_test1.xml b/test/ref/cpl_metadata_test1.xml index b0641ab9..9fac07ce 100644 --- a/test/ref/cpl_metadata_test1.xml +++ b/test/ref/cpl_metadata_test1.xml @@ -23,7 +23,7 @@ 24 0 24 - BM4qh04HOSGF5vop4mhJBE7C4M0= + AjCzoIG/11nYHsTmKGLJf/zWANI= 24 1 1998 1080 diff --git a/test/ref/cpl_metadata_test2.xml b/test/ref/cpl_metadata_test2.xml index f57dd06a..f7fe62a3 100644 --- a/test/ref/cpl_metadata_test2.xml +++ b/test/ref/cpl_metadata_test2.xml @@ -23,7 +23,7 @@ 24 0 24 - BM4qh04HOSGF5vop4mhJBE7C4M0= + AjCzoIG/11nYHsTmKGLJf/zWANI= 24 1 1998 1080 diff --git a/test/test.cc b/test/test.cc index dc18f190..7ee42cf8 100644 --- a/test/test.cc +++ b/test/test.cc @@ -267,9 +267,16 @@ simple_picture (boost::filesystem::path path, string suffix, int frames) shared_ptr mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::Standard::SMPTE)); mp->set_metadata (mxf_meta); shared_ptr picture_writer = mp->start_write (path / dcp::String::compose("video%1.mxf", suffix), false); - dcp::ArrayData j2c ("test/data/flat_red.j2c"); + + dcp::Size const size (1998, 1080); + auto image = make_shared(size); + for (int i = 0; i < 3; ++i) { + memset (image->data(i), 0, 2 * size.width * size.height); + } + auto j2c = dcp::compress_j2k (image, 100000000, 24, false, false); + for (int i = 0; i < frames; ++i) { - picture_writer->write (j2c.data (), j2c.size ()); + picture_writer->write (j2c.data(), j2c.size()); } picture_writer->finalize (); diff --git a/test/verify_test.cc b/test/verify_test.cc index fc2ed203..f5a012a6 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -332,8 +332,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_picture_sound_hashes) { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES, dcp_test1_cpl_id, canonical(dir / dcp_test1_cpl) }, { 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 'xxz+gUPoPMdbFlAewvWIq8BRhBmA=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 }, - { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xXGhFVrqZqapOJx5Fh2SLjj48Yjg=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 19 }, + { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xX3bMCBdXEOYEpYmsConNWrWUAGs=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 12 }, + { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xaddO7je2lZSNQp55qjCWo5DLKFQ=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 19 }, { dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xqtXbkcwhUj/yqquVLmV+wbzbxQ8=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl), 26 } }); } @@ -2187,7 +2187,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash) { BOOST_REQUIRE (cpl->file()); Editor e(cpl->file().get()); - e.replace("XGhFVrqZqapOJx5Fh2SLjj48Yjg=", ""); + e.replace("addO7je2lZSNQp55qjCWo5DLKFQ=", ""); } check_verify_result ( -- 2.30.2