X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_test.cc;h=4a6cb42981bba0cc5b8355697ee1f1d24844010a;hb=ea629ead13e819b4ff5d5b5eba7b57520e8107e3;hp=5c07a0c8fb7abd0a179341e2df4c2fc3325d5868;hpb=ffbf3cf7f94eda1441e8a6f53c2fb32b3dc6ad08;p=libdcp.git

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 5c07a0c8..4a6cb429 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,24 +20,26 @@
 #include "dcp.h"
 #include "metadata.h"
 #include "cpl.h"
-#include "mono_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 "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 <sndfile.h>
 #include <boost/test/unit_test.hpp>
 
+using std::string;
 using boost::shared_ptr;
 
-/* Test creation of a DCP from very simple inputs */
-BOOST_AUTO_TEST_CASE (dcp_test)
+/** Test creation of a 2D DCP from very simple inputs */
+BOOST_AUTO_TEST_CASE (dcp_test1)
 {
 	Kumu::libdcp_test = true;
 
@@ -51,27 +53,27 @@ BOOST_AUTO_TEST_CASE (dcp_test)
 	mxf_meta.product_name = "OpenDCP";
 	mxf_meta.product_version = "0.0.25";
 
-	/* We're making build/test/foo */
-	boost::filesystem::remove_all ("build/test/DCP/foo");
-	boost::filesystem::create_directories ("build/test/DCP/foo");
-	dcp::DCP d ("build/test/DCP/foo");
+	/* 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");
 	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);
 
-	shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
+	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
 	mp->set_metadata (mxf_meta);
-	shared_ptr<dcp::PictureMXFWriter> picture_writer = mp->start_write ("build/test/DCP/foo/video.mxf", dcp::SMPTE, false);
+	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test1/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<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));
 	ms->set_metadata (mxf_meta);
-	shared_ptr<dcp::SoundMXFWriter> sound_writer = ms->start_write ("build/test/DCP/foo/audio.mxf", dcp::SMPTE);
+	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test1/audio.mxf", dcp::SMPTE);
 
 	SF_INFO info;
 	info.format = 0;
@@ -87,9 +89,9 @@ BOOST_AUTO_TEST_CASE (dcp_test)
 			break;
 		}
 	}
-	
+
 	sound_writer->finalize ();
-	
+
 	cpl->add (shared_ptr<dcp::Reel> (
 			  new dcp::Reel (
 				  shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mp, 0)),
@@ -97,12 +99,111 @@ BOOST_AUTO_TEST_CASE (dcp_test)
 				  shared_ptr<dcp::ReelSubtitleAsset> ()
 				  )
 			  ));
-		  
+
+	d.add (cpl);
+
+	d.write_xml (dcp::SMPTE, xml_meta);
+
+	/* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run-tests.sh */
+}
+
+/** Test creation of a 3D DCP from very simple inputs */
+BOOST_AUTO_TEST_CASE (dcp_test2)
+{
+	Kumu::libdcp_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_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);
+
+	shared_ptr<dcp::StereoPictureAsset> mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1)));
+	mp->set_metadata (mxf_meta);
+	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", dcp::SMPTE, 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::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1));
+	ms->set_metadata (mxf_meta);
+	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test2/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 ();
+
+	cpl->add (shared_ptr<dcp::Reel> (
+			  new dcp::Reel (
+				  shared_ptr<dcp::ReelStereoPictureAsset> (new dcp::ReelStereoPictureAsset (mp, 0)),
+				  shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0)),
+				  shared_ptr<dcp::ReelSubtitleAsset> ()
+				  )
+			  ));
+
 	d.add (cpl);
-	d.add (mp);
-	d.add (ms);
 
 	d.write_xml (dcp::SMPTE, xml_meta);
 
-	/* build/test/DCP/foo is checked against test/ref/DCP/foo by run-tests.sh */
+	/* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run-tests.sh */
+}
+
+static void
+note (dcp::NoteType, string)
+{
+
 }
+
+/** 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 (&note, _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 (&note, _1, _2)));
+}
+