X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftorture_test.cc;h=0c781fdb1218faa4e6c5d0d0f72747a6a59cb94d;hb=83d63bb331190db4372de4d0aaf8413c51f1eee4;hp=764491c0a63ea5d31af368d41411b660b8f56934;hpb=7534e2cd4b44d29f932834ba14f28f0b4c6b6d60;p=dcpomatic.git

diff --git a/test/torture_test.cc b/test/torture_test.cc
index 764491c0a..0c781fdb1 100644
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,94 +18,96 @@
 
 */
 
+
 /** @file  test/torture_test.cc
  *  @brief Tricky arrangements of content whose resulting DCPs are checked programmatically.
  *  @ingroup completedcp
  */
 
+
 #include "lib/audio_content.h"
-#include "lib/film.h"
+#include "lib/content_factory.h"
+#include "lib/dcp_content.h"
 #include "lib/dcp_content_type.h"
+#include "lib/film.h"
 #include "lib/ratio.h"
-#include "lib/content_factory.h"
+#include "lib/text_content.h"
 #include "lib/video_content.h"
 #include "test.h"
 #include <dcp/cpl.h>
-#include <dcp/reel.h>
-#include <dcp/reel_sound_asset.h>
-#include <dcp/reel_picture_asset.h>
-#include <dcp/sound_asset.h>
 #include <dcp/mono_picture_asset.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/openjpeg_image.h>
+#include <dcp/reel.h>
+#include <dcp/reel_picture_asset.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/sound_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
-using std::list;
+
 using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+using std::list;
+using std::make_shared;
+using std::shared_ptr;
 using namespace dcpomatic;
 
+
 /** Test start/end trim and positioning of some audio content */
 BOOST_AUTO_TEST_CASE (torture_test1)
 {
-	shared_ptr<Film> film = new_test_film ("torture_test1");
-	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
-	film->set_name ("torture_test1");
-	film->set_container (Ratio::from_id ("185"));
+	auto film = new_test_film2 ("torture_test1");
 	film->set_sequence (false);
 
 	/* Staircase at an offset of 2000 samples, trimmed both start and end, with a gain of exactly 2 (linear) */
-	shared_ptr<Content> staircase = content_factory("test/data/staircase.wav").front ();
+	auto staircase = content_factory("test/data/staircase.wav")[0];
 	film->examine_and_add_content (staircase);
 	BOOST_REQUIRE (!wait_for_jobs());
-	staircase->set_position (film, DCPTime::from_frames (2000, film->audio_frame_rate()));
-	staircase->set_trim_start (ContentTime::from_frames (12, 48000));
+	staircase->set_position (film, DCPTime::from_frames(2000, film->audio_frame_rate()));
+	staircase->set_trim_start(film, ContentTime::from_frames(12, 48000));
 	staircase->set_trim_end (ContentTime::from_frames (35, 48000));
 	staircase->audio->set_gain (20 * log10(2));
 
 	/* And again at an offset of 50000 samples, trimmed both start and end, with a gain of exactly 2 (linear) */
-	staircase = content_factory("test/data/staircase.wav").front ();
+	staircase = content_factory("test/data/staircase.wav")[0];
 	film->examine_and_add_content (staircase);
 	BOOST_REQUIRE (!wait_for_jobs());
 	staircase->set_position (film, DCPTime::from_frames(50000, film->audio_frame_rate()));
-	staircase->set_trim_start (ContentTime::from_frames (12, 48000));
-	staircase->set_trim_end (ContentTime::from_frames (35, 48000));
+	staircase->set_trim_start(film, ContentTime::from_frames(12, 48000));
+	staircase->set_trim_end (ContentTime::from_frames(35, 48000));
 	staircase->audio->set_gain (20 * log10(2));
 
 	/* 1s of red at 5s in */
-	shared_ptr<Content> red = content_factory("test/data/flat_red.png").front ();
+	auto red = content_factory("test/data/flat_red.png")[0];
 	film->examine_and_add_content (red);
 	BOOST_REQUIRE (!wait_for_jobs());
 	red->set_position (film, DCPTime::from_seconds(5));
 	red->video->set_length (24);
 
 	film->set_video_frame_rate (24);
-	film->write_metadata ();
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (film);
 
 	dcp::DCP dcp ("build/test/torture_test1/" + film->dcp_name(false));
 	dcp.read ();
 
-	list<shared_ptr<dcp::CPL> > cpls = dcp.cpls ();
-	BOOST_REQUIRE_EQUAL (cpls.size(), 1);
-	list<shared_ptr<dcp::Reel> > reels = cpls.front()->reels ();
-	BOOST_REQUIRE_EQUAL (reels.size(), 1);
+	auto cpls = dcp.cpls ();
+	BOOST_REQUIRE_EQUAL (cpls.size(), 1U);
+	auto reels = cpls.front()->reels ();
+	BOOST_REQUIRE_EQUAL (reels.size(), 1U);
 
 	/* Check sound */
 
-	shared_ptr<dcp::ReelSoundAsset> reel_sound = reels.front()->main_sound();
+	auto reel_sound = reels.front()->main_sound();
 	BOOST_REQUIRE (reel_sound);
-	shared_ptr<dcp::SoundAsset> sound = reel_sound->asset();
+	auto sound = reel_sound->asset();
 	BOOST_REQUIRE (sound);
 	BOOST_CHECK_EQUAL (sound->intrinsic_duration(), 144);
 
-	shared_ptr<dcp::SoundAssetReader> sound_reader = sound->start_read ();
+	auto sound_reader = sound->start_read ();
 
 	/* First frame silent */
-	shared_ptr<const dcp::SoundFrame> fr = sound_reader->get_frame (0);
+	auto fr = sound_reader->get_frame (0);
 	for (int i = 0; i < fr->samples(); ++i) {
 		for (int j = 0; j < 6; ++j) {
 			BOOST_CHECK_EQUAL (fr->get(j, i), 0);
@@ -118,49 +120,57 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 
 	int stair = 12;
 
-	fr = sound_reader->get_frame (1);
-	for (int i = 0; i < fr->samples(); ++i) {
-		for (int j = 0; j < 6; ++j) {
-			if (j == 2) {
-				BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
-				++stair;
-			} else {
-				BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+	BOOST_TEST_CONTEXT("First staircase, frame #1") {
+		fr = sound_reader->get_frame (1);
+		for (int i = 0; i < fr->samples(); ++i) {
+			for (int j = 0; j < 6; ++j) {
+				if (j == 2) {
+					BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
+					++stair;
+				} else {
+					BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+				}
 			}
 		}
 	}
 
-	fr = sound_reader->get_frame (2);
-	for (int i = 0; i < fr->samples(); ++i) {
-		for (int j = 0; j < 6; ++j) {
-			if (j == 2) {
-				BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
-				++stair;
-			} else {
-				BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+	BOOST_TEST_CONTEXT("First staircase, frame #2") {
+		fr = sound_reader->get_frame (2);
+		for (int i = 0; i < fr->samples(); ++i) {
+			for (int j = 0; j < 6; ++j) {
+				if (j == 2) {
+					BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
+					++stair;
+				} else {
+					BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+				}
 			}
 		}
 	}
 
-	fr = sound_reader->get_frame (3);
-	for (int i = 0; i < fr->samples(); ++i) {
-		for (int j = 0; j < 6; ++j) {
-			if (j == 2 && i < (4753 - (2000 * 2))) {
-				BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
-				++stair;
-			} else {
-				BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+	BOOST_TEST_CONTEXT("First staircase, frame #3") {
+		fr = sound_reader->get_frame (3);
+		for (int i = 0; i < fr->samples(); ++i) {
+			for (int j = 0; j < 6; ++j) {
+				if (j == 2 && i < (4753 - (2000 * 2))) {
+					BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
+					++stair;
+				} else {
+					BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+				}
 			}
 		}
 	}
 
 	/* Then some silence */
 
-	for (int i = 4; i < 24; ++i) {
-		fr = sound_reader->get_frame (i);
-		for (int j = 0; j < fr->samples(); ++j) {
-			for (int k = 0; k < 6; ++k) {
-				BOOST_CHECK_EQUAL (fr->get(k, j), 0);
+	BOOST_TEST_CONTEXT("Silence") {
+		for (int i = 4; i < 24; ++i) {
+			fr = sound_reader->get_frame (i);
+			for (int j = 0; j < fr->samples(); ++j) {
+				for (int k = 0; k < 6; ++k) {
+					BOOST_CHECK_EQUAL (fr->get(k, j), 0);
+				}
 			}
 		}
 	}
@@ -218,31 +228,33 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 
 	/* Check picture */
 
-	shared_ptr<dcp::ReelPictureAsset> reel_picture = reels.front()->main_picture();
+	auto reel_picture = reels.front()->main_picture();
 	BOOST_REQUIRE (reel_picture);
-	shared_ptr<dcp::MonoPictureAsset> picture = dynamic_pointer_cast<dcp::MonoPictureAsset> (reel_picture->asset());
+	auto picture = dynamic_pointer_cast<dcp::MonoPictureAsset> (reel_picture->asset());
 	BOOST_REQUIRE (picture);
 	BOOST_CHECK_EQUAL (picture->intrinsic_duration(), 144);
 
-	shared_ptr<dcp::MonoPictureAssetReader> picture_reader = picture->start_read ();
+	auto picture_reader = picture->start_read ();
 
-	/* First 5 * 24 = 120 frames should be black */
+	/* First 5 * 24 = 120 frames should be black, possibly with a little noise to raise the bitrate */
 
 	shared_ptr<dcp::OpenJPEGImage> ref;
 	for (int i = 0; i < 120; ++i) {
-		shared_ptr<const dcp::MonoPictureFrame> fr = picture_reader->get_frame (i);
-		shared_ptr<dcp::OpenJPEGImage> image = fr->xyz_image ();
-		dcp::Size const size = image->size ();
+		auto fr = picture_reader->get_frame (i);
+		auto image = fr->xyz_image ();
+		auto const size = image->size ();
 		if (i == 0) {
+			/* Check the first frame pixel by pixel... */
 			for (int c = 0; c < 3; ++c) {
 				for (int y = 0; y < size.height; ++y) {
 					for (int x = 0; x < size.width; ++x) {
-						BOOST_REQUIRE_EQUAL (image->data(c)[y * size.height + x], 0);
+						BOOST_REQUIRE (image->data(c)[y * size.height + x] <= 3);
 					}
 				}
 			}
 			ref = image;
 		} else {
+			/* ... then all the others should be the same */
 			for (int c = 0; c < 3; ++c) {
 				BOOST_REQUIRE_MESSAGE (
 					memcmp (image->data(c), ref->data(c), size.width * size.height * sizeof(int)) == 0,
@@ -252,25 +264,25 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 		}
 	}
 
-	/* Then 24 red */
+	/* Then 24 red, perhaps also with some noise */
 
 	for (int i = 120; i < 144; ++i) {
-		shared_ptr<const dcp::MonoPictureFrame> fr = picture_reader->get_frame (i);
-		shared_ptr<dcp::OpenJPEGImage> image = fr->xyz_image ();
-		dcp::Size const size = image->size ();
+		auto fr = picture_reader->get_frame (i);
+		auto image = fr->xyz_image ();
+		auto const size = image->size ();
 		if (i == 120) {
 			for (int y = 0; y < size.height; ++y) {
 				for (int x = 0; x < size.width; ++x) {
 					BOOST_REQUIRE_MESSAGE (
-						abs(image->data(0)[y * size.height + x] - 2808) <= 2,
+						abs(image->data(0)[y * size.height + x] - 2808) <= 5,
 						"failed on frame " << i << " with image data " << image->data(0)[y * size.height + x]
 						);
 					BOOST_REQUIRE_MESSAGE (
-						abs(image->data(1)[y * size.height + x] - 2176) <= 2,
+						abs(image->data(1)[y * size.height + x] - 2176) <= 5,
 						"failed on frame " << i << " with image data " << image->data(1)[y * size.height + x]
 						);
 					BOOST_REQUIRE_MESSAGE (
-						abs(image->data(2)[y * size.height + x] - 865) <= 2,
+						abs(image->data(2)[y * size.height + x] - 865) <= 5,
 						"failed on frame " << i << " with image data " << image->data(2)[y * size.height + x]
 						);
 				}
@@ -287,3 +299,29 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 	}
 
 }
+
+
+BOOST_AUTO_TEST_CASE(multi_reel_interop_ccap_test)
+{
+	auto pic1 = content_factory("test/data/flat_red.png").front();
+	auto ccap1 = content_factory("test/data/15s.srt").front();
+	auto pic2 = content_factory("test/data/flat_red.png").front();
+	auto ccap2 = content_factory("test/data/15s.srt").front();
+	auto film1 = new_test_film2("multi_reel_interop_ccap_test1", { pic1, ccap1, pic2, ccap2 });
+	film1->set_interop(true);
+	film1->set_reel_type(ReelType::BY_VIDEO_CONTENT);
+	ccap1->text[0]->set_type(TextType::CLOSED_CAPTION);
+	pic1->video->set_length(15 * 24);
+	ccap2->text[0]->set_type(TextType::CLOSED_CAPTION);
+	pic2->video->set_length(15 * 24);
+	make_and_verify_dcp(film1, { dcp::VerificationNote::Code::INVALID_STANDARD, dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING });
+
+	auto reload = make_shared<DCPContent>(film1->dir(film1->dcp_name()));
+	auto film2 = new_test_film2("multi_reel_interop_ccap_test2", { reload });
+	for (auto i: reload->text) {
+		i->set_use(true);
+	}
+	film2->set_interop(true);
+	make_and_verify_dcp(film2, { dcp::VerificationNote::Code::INVALID_STANDARD, dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING });
+}
+