From e4ed001fff70bd10b94e61bf36cdffd1a679286d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 25 May 2016 15:08:21 +0100 Subject: Basic writing of DCPs containing Atmos MXFs; untested. --- test/atmos_test.cc | 3 +- test/dcp_test.cc | 84 +++++++++++++++++++-- test/ref/DCP/dcp_test5/ASSETMAP.xml | 2 + test/ref/DCP/dcp_test5/VOLINDEX.xml | 2 + test/ref/DCP/dcp_test5/audio.mxf | Bin 0 -> 161326 bytes .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 2 + .../pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml | 2 + test/ref/DCP/dcp_test5/video.mxf | Bin 0 -> 26080 bytes 8 files changed, 88 insertions(+), 7 deletions(-) create mode 100644 test/ref/DCP/dcp_test5/ASSETMAP.xml create mode 100644 test/ref/DCP/dcp_test5/VOLINDEX.xml create mode 100644 test/ref/DCP/dcp_test5/audio.mxf create mode 100644 test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml create mode 100644 test/ref/DCP/dcp_test5/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml create mode 100644 test/ref/DCP/dcp_test5/video.mxf (limited to 'test') diff --git a/test/atmos_test.cc b/test/atmos_test.cc index 42fc3082..b4c27626 100644 --- a/test/atmos_test.cc +++ b/test/atmos_test.cc @@ -22,7 +22,8 @@ #include #include -BOOST_AUTO_TEST_CASE (atmos_test) +/** Check basic read of an Atmos asset */ +BOOST_AUTO_TEST_CASE (atmos_read_test) { dcp::AtmosAsset a (private_test / "20160218_NameOfFilm_FTR_OV_EN_A_dcs_r01.mxf"); BOOST_CHECK_EQUAL (a.first_frame(), 192); diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 7b5f6f05..6769c496 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -25,12 +25,14 @@ #include "picture_asset_writer.h" #include "sound_asset_writer.h" #include "sound_asset.h" +#include "atmos_asset.h" #include "reel.h" #include "test.h" #include "file.h" #include "reel_mono_picture_asset.h" #include "reel_stereo_picture_asset.h" #include "reel_sound_asset.h" +#include "reel_atmos_asset.h" #include "KM_util.h" #include #include @@ -95,8 +97,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1) cpl->add (shared_ptr ( new dcp::Reel ( shared_ptr (new dcp::ReelMonoPictureAsset (mp, 0)), - shared_ptr (new dcp::ReelSoundAsset (ms, 0)), - shared_ptr () + shared_ptr (new dcp::ReelSoundAsset (ms, 0)) ) )); @@ -104,7 +105,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1) d.write_xml (dcp::SMPTE, xml_meta); - /* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run-tests.sh */ + /* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run/tests */ } /** Test creation of a 3D DCP from very simple inputs */ @@ -167,8 +168,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2) cpl->add (shared_ptr ( new dcp::Reel ( shared_ptr (new dcp::ReelStereoPictureAsset (mp, 0)), - shared_ptr (new dcp::ReelSoundAsset (ms, 0)), - shared_ptr () + shared_ptr (new dcp::ReelSoundAsset (ms, 0)) ) )); @@ -176,7 +176,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2) d.write_xml (dcp::SMPTE, xml_meta); - /* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run-tests.sh */ + /* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run/tests */ } static void @@ -206,3 +206,75 @@ BOOST_AUTO_TEST_CASE (dcp_test4) BOOST_CHECK (!A.equals (B, dcp::EqualityOptions(), boost::bind (¬e, _1, _2))); } + +/** Test creation of a 2D DCP with an Atmos track */ +BOOST_AUTO_TEST_CASE (dcp_test5) +{ + Kumu::cth_test = true; + + /* Some known metadata */ + dcp::XMLMetadata xml_meta; + xml_meta.issuer = "OpenDCP 0.0.25"; + xml_meta.creator = "OpenDCP 0.0.25"; + xml_meta.issue_date = "2012-07-17T04:45:18+00:00"; + dcp::MXFMetadata mxf_meta; + mxf_meta.company_name = "OpenDCP"; + mxf_meta.product_name = "OpenDCP"; + mxf_meta.product_version = "0.0.25"; + + /* We're making build/test/DCP/dcp_test5 */ + boost::filesystem::remove_all ("build/test/DCP/dcp_test5"); + boost::filesystem::create_directories ("build/test/DCP/dcp_test5"); + dcp::DCP d ("build/test/DCP/dcp_test5"); + shared_ptr cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); + cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); + cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); + cpl->set_metadata (xml_meta); + + shared_ptr mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1))); + mp->set_metadata (mxf_meta); + shared_ptr picture_writer = mp->start_write ("build/test/DCP/dcp_test5/video.mxf", dcp::SMPTE, false); + dcp::File j2c ("test/data/32x32_red_square.j2c"); + for (int i = 0; i < 24; ++i) { + picture_writer->write (j2c.data (), j2c.size ()); + } + picture_writer->finalize (); + + shared_ptr ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1)); + ms->set_metadata (mxf_meta); + shared_ptr sound_writer = ms->start_write ("build/test/DCP/dcp_test5/audio.mxf", dcp::SMPTE); + + SF_INFO info; + info.format = 0; + SNDFILE* sndfile = sf_open ("test/data/1s_24-bit_48k_silence.wav", SFM_READ, &info); + BOOST_CHECK (sndfile); + float buffer[4096*6]; + float* channels[1]; + channels[0] = buffer; + while (1) { + sf_count_t N = sf_readf_float (sndfile, buffer, 4096); + sound_writer->write (channels, N); + if (N < 4096) { + break; + } + } + + sound_writer->finalize (); + + shared_ptr am (new dcp::AtmosAsset (private_test / "20160218_NameOfFilm_FTR_OV_EN_A_dcs_r01.mxf")); + + cpl->add (shared_ptr ( + new dcp::Reel ( + shared_ptr (new dcp::ReelMonoPictureAsset (mp, 0)), + shared_ptr (new dcp::ReelSoundAsset (ms, 0)), + shared_ptr (), + shared_ptr (new dcp::ReelAtmosAsset (am, 0)) + ) + )); + + d.add (cpl); + + d.write_xml (dcp::SMPTE, xml_meta); + + /* build/test/DCP/dcp_test5 is checked against test/ref/DCP/dcp_test5 by run/tests */ +} diff --git a/test/ref/DCP/dcp_test5/ASSETMAP.xml b/test/ref/DCP/dcp_test5/ASSETMAP.xml new file mode 100644 index 00000000..3eedfb31 --- /dev/null +++ b/test/ref/DCP/dcp_test5/ASSETMAP.xml @@ -0,0 +1,2 @@ + +urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55Created by OpenDCP 0.0.25OpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09truepkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml101022urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375bcpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml101768urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516video.mxf1026080urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9audio.mxf10161326 diff --git a/test/ref/DCP/dcp_test5/VOLINDEX.xml b/test/ref/DCP/dcp_test5/VOLINDEX.xml new file mode 100644 index 00000000..021685e9 --- /dev/null +++ b/test/ref/DCP/dcp_test5/VOLINDEX.xml @@ -0,0 +1,2 @@ + +1 diff --git a/test/ref/DCP/dcp_test5/audio.mxf b/test/ref/DCP/dcp_test5/audio.mxf new file mode 100644 index 00000000..9b3fa1d3 Binary files /dev/null and b/test/ref/DCP/dcp_test5/audio.mxf differ diff --git a/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml new file mode 100644 index 00000000..0a50412d --- /dev/null +++ b/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -0,0 +1,2 @@ + +urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375bA Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25A Test DCPfeatureurn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:0081fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516video.mxf24 124024KdrrbczelKFhmvqbhvzFX7Mxiro=24 132 32urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9audio.mxf24 124024+dJynGEtjP7cApJ17SNz171iI4A=urn:uuid:b135d5cf-d180-43d8-b0b3-7373737b73bf20160218_NameOfFilm_FTR_OV_EN_A_dcs_r01.mxf24 1148901489jo8pQSebhScPN4EVvvpIUWRrDeM=urn:smpte:ul:060e2b34.04010105.0e090604.00000000 diff --git a/test/ref/DCP/dcp_test5/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml b/test/ref/DCP/dcp_test5/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml new file mode 100644 index 00000000..94983c4a --- /dev/null +++ b/test/ref/DCP/dcp_test5/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml @@ -0,0 +1,2 @@ + +urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09A Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b81fb54df-e1bf-4647-8788-ea7ba154375bdVhGU/gRwjhAp0yGxCqaHuGy2tI=1768text/xmlurn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc51646c3eb45-15e5-47d6-8684-d8641e4dc516KdrrbczelKFhmvqbhvzFX7Mxiro=26080application/mxfurn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe99482e87d-292d-4e0e-a98d-c61822b60fe9+dJynGEtjP7cApJ17SNz171iI4A=161326application/mxf diff --git a/test/ref/DCP/dcp_test5/video.mxf b/test/ref/DCP/dcp_test5/video.mxf new file mode 100644 index 00000000..89af834e Binary files /dev/null and b/test/ref/DCP/dcp_test5/video.mxf differ -- cgit v1.2.3