X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fwriter_test.cc;h=d5cafe1fbfd33aa25f517910e02d50327a2d194f;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=dade4d6b4388ab36e0ce42ac9469d0dfb163305b;hpb=786d0317a86f81d391efd4fab1bb331b4959f666;p=dcpomatic.git

diff --git a/test/writer_test.cc b/test/writer_test.cc
index dade4d6b4..d5cafe1fb 100644
--- a/test/writer_test.cc
+++ b/test/writer_test.cc
@@ -22,24 +22,28 @@
 #include "lib/audio_buffers.h"
 #include "lib/content.h"
 #include "lib/content_factory.h"
+#include "lib/cross.h"
 #include "lib/film.h"
 #include "lib/job.h"
 #include "lib/video_content.h"
 #include "lib/writer.h"
 #include "test.h"
+#include <dcp/openjpeg_image.h>
+#include <dcp/j2k_transcode.h>
 #include <boost/test/unit_test.hpp>
 #include <memory>
 
 
 using std::make_shared;
 using std::shared_ptr;
+using std::vector;
 
 
 BOOST_AUTO_TEST_CASE (test_write_odd_amount_of_silence)
 {
-	auto content = content_factory("test/data/flat_red.png").front();
-	auto film = new_test_film2 ("test_write_odd_amount_of_silence", {content});
-	content->video->set_length(24);
+	auto content = content_factory("test/data/flat_red.png");
+	auto film = new_test_film2 ("test_write_odd_amount_of_silence", content);
+	content[0]->video->set_length(24);
 	auto writer = make_shared<Writer>(film, shared_ptr<Job>());
 
 	auto audio = make_shared<AudioBuffers>(6, 48000);
@@ -47,3 +51,113 @@ BOOST_AUTO_TEST_CASE (test_write_odd_amount_of_silence)
 	writer->write (audio, dcpomatic::DCPTime(1));
 }
 
+
+BOOST_AUTO_TEST_CASE (interrupt_writer)
+{
+	Cleanup cl;
+
+	auto film = new_test_film2 ("test_interrupt_writer", {}, &cl);
+
+	auto content = content_factory("test/data/check_image0.png")[0];
+	film->examine_and_add_content (content);
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	/* Add some dummy content to the film so that it has a reel of the right length */
+	auto constexpr frames = 24 * 60;
+	content->video->set_length (frames);
+
+	/* Make a random J2K image */
+	auto size = dcp::Size(1998, 1080);
+	auto image = make_shared<dcp::OpenJPEGImage>(size);
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < (size.width * size.height); ++j) {
+			image->data(i)[j] = rand();
+		}
+	}
+
+	/* Write some data */
+	auto video = dcp::compress_j2k(image, 100000000, 24, false, false);
+	auto video_ptr = make_shared<dcp::ArrayData>(video.data(), video.size());
+	auto audio = make_shared<AudioBuffers>(6, 48000 / 24);
+
+	auto writer = make_shared<Writer>(film, shared_ptr<Job>());
+	writer->start ();
+
+	for (int i = 0; i < frames; ++i) {
+		writer->write (video_ptr, i, Eyes::BOTH);
+		writer->write (audio, dcpomatic::DCPTime::from_frames(i, 24));
+	}
+
+	/* Start digest calculations then abort them; there should be no crash or error */
+	boost::thread thread([film, writer]() {
+		writer->finish(film->dir(film->dcp_name()));
+	});
+
+	dcpomatic_sleep_seconds	(1);
+
+	thread.interrupt ();
+	thread.join ();
+
+	dcpomatic_sleep_seconds (1);
+	cl.run ();
+}
+
+
+BOOST_AUTO_TEST_CASE (writer_disambiguate_font_ids1)
+{
+	auto film = new_test_film2("writer_disambiguate_font_ids1", {});
+	Writer writer(film, {});
+
+	auto fonts = vector<shared_ptr<dcpomatic::Font>> {
+		make_shared<dcpomatic::Font>("a"),
+		make_shared<dcpomatic::Font>("b"),
+		make_shared<dcpomatic::Font>("c")
+	};
+
+	writer.write(fonts);
+
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[0]), "a");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[1]), "b");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[2]), "c");
+}
+
+
+BOOST_AUTO_TEST_CASE (writer_disambiguate_font_ids2)
+{
+	auto film = new_test_film2("writer_disambiguate_font_ids2", {});
+	Writer writer(film, {});
+
+	auto fonts = vector<shared_ptr<dcpomatic::Font>> {
+		make_shared<dcpomatic::Font>("a"),
+		make_shared<dcpomatic::Font>("a"),
+		make_shared<dcpomatic::Font>("a")
+	};
+
+	writer.write(fonts);
+
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[0]), "a");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[1]), "a_0");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[2]), "a_1");
+}
+
+
+BOOST_AUTO_TEST_CASE (writer_disambiguate_font_ids3)
+{
+	auto film = new_test_film2("writer_disambiguate_font_ids3", {});
+	Writer writer(film, {});
+
+	auto fonts = vector<shared_ptr<dcpomatic::Font>> {
+		make_shared<dcpomatic::Font>("a_2"),
+		make_shared<dcpomatic::Font>("a_1"),
+		make_shared<dcpomatic::Font>("a_1"),
+		make_shared<dcpomatic::Font>("b")
+	};
+
+	writer.write(fonts);
+
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[1]), "a_1");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[0]), "a_2");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[2]), "a_3");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[3]), "b");
+}
+