/*
- Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
+
+ 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"
#include "metadata.h"
#include "cpl.h"
-#include "mono_picture_mxf.h"
-#include "stereo_picture_mxf.h"
-#include "picture_mxf_writer.h"
-#include "sound_mxf_writer.h"
-#include "sound_mxf.h"
-#include "subtitle_content.h"
+#include "mono_picture_asset.h"
+#include "stereo_picture_asset.h"
+#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 <asdcp/KM_util.h>
#include <sndfile.h>
#include <boost/test/unit_test.hpp>
using std::string;
+using std::vector;
using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
-/** Test creation of a 2D DCP from very simple inputs */
+/** Test creation of a 2D SMPTE DCP from very simple inputs */
BOOST_AUTO_TEST_CASE (dcp_test1)
{
- Kumu::libdcp_test = true;
+ RNGFixer fixer;
+
+ make_simple("build/test/DCP/dcp_test1")->write_xml(
+ dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"
+ );
+
+ /* 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)
+{
+ RNGFixer fix;
/* 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_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");
+ /* We're making build/test/DCP/dcp_test2 */
+ boost::filesystem::remove_all ("build/test/DCP/dcp_test2");
+ boost::filesystem::create_directories ("build/test/DCP/dcp_test2");
+ dcp::DCP d ("build/test/DCP/dcp_test2");
shared_ptr<dcp::CPL> 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);
+ cpl->set_content_version (
+ dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00")
+ );
+ cpl->set_issuer ("OpenDCP 0.0.25");
+ cpl->set_creator ("OpenDCP 0.0.25");
+ cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
+ cpl->set_annotation_text ("A Test DCP");
- shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
+ shared_ptr<dcp::StereoPictureAsset> mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
mp->set_metadata (mxf_meta);
- shared_ptr<dcp::PictureMXFWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test1/video.mxf", dcp::SMPTE, false);
+ shared_ptr<dcp::PictureAssetWriter> 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 */
+ picture_writer->write (j2c.data (), j2c.size ());
+ /* Right */
picture_writer->write (j2c.data (), j2c.size ());
}
picture_writer->finalize ();
- shared_ptr<dcp::SoundMXF> ms (new dcp::SoundMXF (dcp::Fraction (24, 1), 48000, 1));
+ shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::SMPTE));
ms->set_metadata (mxf_meta);
- shared_ptr<dcp::SoundMXFWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test1/audio.mxf", dcp::SMPTE);
+ shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", vector<dcp::Channel>());
SF_INFO info;
info.format = 0;
break;
}
}
-
+
sound_writer->finalize ();
-
+
cpl->add (shared_ptr<dcp::Reel> (
new dcp::Reel (
- shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mp, 0)),
- shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0)),
- shared_ptr<dcp::ReelSubtitleAsset> ()
+ shared_ptr<dcp::ReelStereoPictureAsset> (new dcp::ReelStereoPictureAsset (mp, 0)),
+ shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0))
)
));
-
+
d.add (cpl);
- d.add (mp);
- d.add (ms);
- d.write_xml (dcp::SMPTE, xml_meta);
+ d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
- /* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run-tests.sh */
+ /* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run/tests */
}
-/** Test creation of a 3D DCP from very simple inputs */
-BOOST_AUTO_TEST_CASE (dcp_test2)
+static void
+note (dcp::NoteType, string)
{
- Kumu::libdcp_test = true;
+
+}
+
+/** Test comparison of a DCP with itself */
+BOOST_AUTO_TEST_CASE (dcp_test3)
+{
+ dcp::DCP A ("test/ref/DCP/dcp_test1");
+ A.read ();
+ dcp::DCP B ("test/ref/DCP/dcp_test1");
+ B.read ();
+
+ BOOST_CHECK (A.equals (B, dcp::EqualityOptions(), boost::bind (¬e, _1, _2)));
+}
+
+/** Test comparison of a DCP with a different DCP */
+BOOST_AUTO_TEST_CASE (dcp_test4)
+{
+ dcp::DCP A ("test/ref/DCP/dcp_test1");
+ A.read ();
+ dcp::DCP B ("test/ref/DCP/dcp_test2");
+ B.read ();
+
+ 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.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_test2 */
- boost::filesystem::remove_all ("build/test/DCP/dcp_test2");
- boost::filesystem::create_directories ("build/test/DCP/dcp_test2");
- dcp::DCP d ("build/test/DCP/dcp_test2");
+ /* 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<dcp::CPL> 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);
+ cpl->set_content_version (
+ dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00")
+ );
+ cpl->set_issuer ("OpenDCP 0.0.25");
+ cpl->set_creator ("OpenDCP 0.0.25");
+ cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
+ cpl->set_annotation_text ("A Test DCP");
- shared_ptr<dcp::StereoPictureMXF> mp (new dcp::StereoPictureMXF (dcp::Fraction (24, 1)));
+ shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
mp->set_metadata (mxf_meta);
- shared_ptr<dcp::PictureMXFWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", dcp::SMPTE, false);
+ shared_ptr<dcp::PictureAssetWriter> 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) {
- /* Left */
- picture_writer->write (j2c.data (), j2c.size ());
- /* Right */
picture_writer->write (j2c.data (), j2c.size ());
}
picture_writer->finalize ();
- shared_ptr<dcp::SoundMXF> ms (new dcp::SoundMXF (dcp::Fraction (24, 1), 48000, 1));
+ shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::SMPTE));
ms->set_metadata (mxf_meta);
- shared_ptr<dcp::SoundMXFWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", dcp::SMPTE);
+ shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test5/audio.mxf", vector<dcp::Channel>());
SF_INFO info;
info.format = 0;
float buffer[4096*6];
float* channels[1];
channels[0] = buffer;
- while (1) {
+ 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<dcp::AtmosAsset> am (new dcp::AtmosAsset (private_test / "20160218_NameOfFilm_FTR_OV_EN_A_dcs_r01.mxf"));
+
cpl->add (shared_ptr<dcp::Reel> (
new dcp::Reel (
- shared_ptr<dcp::ReelStereoPictureAsset> (new dcp::ReelStereoPictureAsset (mp, 0)),
+ shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mp, 0)),
shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0)),
- shared_ptr<dcp::ReelSubtitleAsset> ()
+ shared_ptr<dcp::ReelSubtitleAsset> (),
+ shared_ptr<dcp::ReelMarkersAsset> (),
+ shared_ptr<dcp::ReelAtmosAsset> (new dcp::ReelAtmosAsset (am, 0))
)
));
-
+
d.add (cpl);
- d.add (mp);
- d.add (ms);
- d.write_xml (dcp::SMPTE, xml_meta);
+ d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
- /* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run-tests.sh */
+ /* build/test/DCP/dcp_test5 is checked against test/ref/DCP/dcp_test5 by run/tests */
}
-static void
-note (dcp::NoteType, string)
+/** 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 comparison of a DCP with itself */
-BOOST_AUTO_TEST_CASE (dcp_test3)
+/** Test creation of a 2D Interop DCP from very simple inputs */
+BOOST_AUTO_TEST_CASE (dcp_test7)
{
- dcp::DCP A ("test/ref/DCP/dcp_test1");
- A.read ();
- dcp::DCP B ("test/ref/DCP/dcp_test1");
- B.read ();
-
- BOOST_CHECK (A.equals (B, dcp::EqualityOptions(), boost::bind (¬e, _1, _2)));
+ RNGFixer fix;
+
+ make_simple("build/test/DCP/dcp_test7")->write_xml(
+ dcp::INTEROP, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"
+ );
+
+ /* build/test/DCP/dcp_test7 is checked against test/ref/DCP/dcp_test7 by run/tests */
}
-/** Test comparison of a DCP with a different DCP */
-BOOST_AUTO_TEST_CASE (dcp_test4)
+/** Test reading of a DCP with multiple CPLs */
+BOOST_AUTO_TEST_CASE (dcp_test8)
{
- dcp::DCP A ("test/ref/DCP/dcp_test1");
- A.read ();
- dcp::DCP B ("test/ref/DCP/dcp_test2");
- B.read ();
-
- BOOST_CHECK (!A.equals (B, dcp::EqualityOptions(), boost::bind (¬e, _1, _2)));
+ 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);
}
+
+/** Test reading a DCP whose ASSETMAP contains assets not used by any PKL */
+BOOST_AUTO_TEST_CASE (dcp_things_in_assetmap_not_in_pkl)
+{
+ dcp::DCP dcp ("test/data/extra_assetmap");
+ BOOST_CHECK_NO_THROW (dcp.read());
+}
projects / libdcp.git / blobdiff