X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_test.cc;h=54ecab00cf616e48d8244a9b506c6b8ad3435a10;hb=f77a03cc3ec0c5f917e0a2b6cf7599d035b34cff;hp=7b5f6f0529b7cd7a757858a4d5eb187367898383;hpb=a2374eb06a0f6d391d1d5ae04f50ce5e8076173a;p=libdcp.git diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 7b5f6f05..54ecab00 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -1,20 +1,34 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + libdcp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ #include "dcp.h" @@ -25,26 +39,27 @@ #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 "KM_util.h" +#include "reel_atmos_asset.h" +#include #include #include using std::string; using boost::shared_ptr; -/** Test creation of a 2D DCP from very simple inputs */ -BOOST_AUTO_TEST_CASE (dcp_test1) +static shared_ptr +make_simple (boost::filesystem::path path) { - Kumu::cth_test = true; - /* Some known metadata */ dcp::XMLMetadata xml_meta; + xml_meta.annotation_text = "A Test DCP"; 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"; @@ -54,26 +69,26 @@ BOOST_AUTO_TEST_CASE (dcp_test1) mxf_meta.product_version = "0.0.25"; /* We're making build/test/DCP/dcp_test1 */ - boost::filesystem::remove_all ("build/test/DCP/dcp_test1"); - boost::filesystem::create_directories ("build/test/DCP/dcp_test1"); - dcp::DCP d ("build/test/DCP/dcp_test1"); + boost::filesystem::remove_all (path); + boost::filesystem::create_directories (path); + shared_ptr d (new dcp::DCP (path)); 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_content_version_id ("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11"); + cpl->set_content_version_label_text ("content-version-label-text"); cpl->set_metadata (xml_meta); - shared_ptr mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1))); + shared_ptr mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE)); mp->set_metadata (mxf_meta); - shared_ptr picture_writer = mp->start_write ("build/test/DCP/dcp_test1/video.mxf", dcp::SMPTE, false); + shared_ptr picture_writer = mp->start_write (path / "video.mxf", 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)); + shared_ptr ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1, dcp::SMPTE)); ms->set_metadata (mxf_meta); - shared_ptr sound_writer = ms->start_write ("build/test/DCP/dcp_test1/audio.mxf", dcp::SMPTE); + shared_ptr sound_writer = ms->start_write (path / "audio.mxf"); SF_INFO info; info.format = 0; @@ -95,25 +110,36 @@ 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)) ) )); - d.add (cpl); + d->add (cpl); + return d; +} - d.write_xml (dcp::SMPTE, xml_meta); +/** Test creation of a 2D SMPTE DCP from very simple inputs */ +BOOST_AUTO_TEST_CASE (dcp_test1) +{ + RNGFixer fixer; - /* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run-tests.sh */ + dcp::XMLMetadata xml_meta; + xml_meta.annotation_text = "Created by libdcp"; + 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"; + make_simple("build/test/DCP/dcp_test1")->write_xml (dcp::SMPTE, xml_meta); + /* 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 */ BOOST_AUTO_TEST_CASE (dcp_test2) { - Kumu::cth_test = true; + RNGFixer fix; /* Some known metadata */ dcp::XMLMetadata xml_meta; + xml_meta.annotation_text = "A Test DCP"; 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"; @@ -131,9 +157,9 @@ BOOST_AUTO_TEST_CASE (dcp_test2) 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::StereoPictureAsset (dcp::Fraction (24, 1))); + shared_ptr mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE)); mp->set_metadata (mxf_meta); - shared_ptr picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", dcp::SMPTE, false); + shared_ptr picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", false); dcp::File j2c ("test/data/32x32_red_square.j2c"); for (int i = 0; i < 24; ++i) { /* Left */ @@ -143,9 +169,9 @@ BOOST_AUTO_TEST_CASE (dcp_test2) } picture_writer->finalize (); - shared_ptr ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1)); + shared_ptr ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1, dcp::SMPTE)); ms->set_metadata (mxf_meta); - shared_ptr sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", dcp::SMPTE); + shared_ptr sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf"); SF_INFO info; info.format = 0; @@ -167,16 +193,16 @@ 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)) ) )); d.add (cpl); + xml_meta.annotation_text = "Created by libdcp"; 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 +232,115 @@ 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) +{ + RNGFixer fix; + + /* Some known metadata */ + dcp::XMLMetadata xml_meta; + xml_meta.annotation_text = "A Test DCP"; + 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), dcp::SMPTE)); + mp->set_metadata (mxf_meta); + shared_ptr picture_writer = mp->start_write ("build/test/DCP/dcp_test5/video.mxf", 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, dcp::SMPTE)); + ms->set_metadata (mxf_meta); + shared_ptr sound_writer = ms->start_write ("build/test/DCP/dcp_test5/audio.mxf"); + + 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 (true) { + 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 (), + shared_ptr (new dcp::ReelAtmosAsset (am, 0)) + ) + )); + + d.add (cpl); + + xml_meta.annotation_text = "Created by libdcp"; + d.write_xml (dcp::SMPTE, xml_meta); + + /* build/test/DCP/dcp_test5 is checked against test/ref/DCP/dcp_test5 by run/tests */ +} + +/** Basic tests of reading a 2D DCP with an Atmos track */ +BOOST_AUTO_TEST_CASE (dcp_test6) +{ + dcp::DCP dcp ("test/ref/DCP/dcp_test5"); + dcp.read (); + + BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1); + BOOST_REQUIRE_EQUAL (dcp.cpls().front()->reels().size(), 1); + BOOST_CHECK (dcp.cpls().front()->reels().front()->main_picture()); + BOOST_CHECK (dcp.cpls().front()->reels().front()->main_sound()); + BOOST_CHECK (!dcp.cpls().front()->reels().front()->main_subtitle()); + BOOST_CHECK (dcp.cpls().front()->reels().front()->atmos()); +} + +/** Test creation of a 2D Interop DCP from very simple inputs */ +BOOST_AUTO_TEST_CASE (dcp_test7) +{ + RNGFixer fix; + + dcp::XMLMetadata xml_meta; + xml_meta.annotation_text = "Created by libdcp"; + 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"; + make_simple("build/test/DCP/dcp_test7")->write_xml (dcp::INTEROP, xml_meta); + /* build/test/DCP/dcp_test7 is checked against test/ref/DCP/dcp_test7 by run/tests */ +} + +/** Test reading of a DCP with multiple PKLs */ +BOOST_AUTO_TEST_CASE (dcp_test8) +{ + dcp::DCP dcp (private_test / "data/SMPTE_TST-B1PB2P_S_EN-EN-CCAP_5171-HI-VI_2K_ISDCF_20151123_DPPT_SMPTE_combo/"); + dcp.read (); + + BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 2); +}