From: Carl Hetherington <cth@carlh.net>
Date: Sun, 8 Mar 2020 21:47:33 +0000 (+0100)
Subject: Add verification checks too see if reel assets' Duration or IntrinsicDuration are... 
X-Git-Tag: v1.8.0~384^2~1
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=82d3db851257dbd460cff1c7eed2640a39b8ebfe;hp=900ad47ca6e2addab8ac376daed834dd7b28c01d;p=libdcp.git

Add verification checks too see if reel assets' Duration or IntrinsicDuration are too small.
---

diff --git a/src/verify.cc b/src/verify.cc
index 10e91320..a8c5001c 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -371,6 +371,16 @@ dcp::verify (
 
 			BOOST_FOREACH (shared_ptr<Reel> reel, cpl->reels()) {
 				stage ("Checking reel", optional<boost::filesystem::path>());
+
+				BOOST_FOREACH (shared_ptr<ReelAsset> i, reel->assets()) {
+					if (i->duration() && (i->duration().get() * i->edit_rate().denominator / i->edit_rate().numerator) < 1) {
+						notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::DURATION_TOO_SMALL, i->id()));
+					}
+					if ((i->intrinsic_duration() * i->edit_rate().denominator / i->edit_rate().numerator) < 1) {
+						notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::INTRINSIC_DURATION_TOO_SMALL, i->id()));
+					}
+				}
+
 				if (reel->main_picture()) {
 					/* Check reel stuff */
 					Fraction const frame_rate = reel->main_picture()->frame_rate();
@@ -472,6 +482,10 @@ dcp::note_to_string (dcp::VerificationNote note)
 		return "The DCP contains both SMPTE and Interop parts.";
 	case dcp::VerificationNote::XML_VALIDATION_ERROR:
 		return String::compose("An XML file is badly formed: %1 (%2:%3)", note.note().get(), note.file()->filename(), note.line().get());
+	case dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL:
+		return String::compose("The intrinsic duration of an asset is less than 1 second long: %1", note.note().get());
+	case dcp::VerificationNote::DURATION_TOO_SMALL:
+		return String::compose("The duration of an asset is less than 1 second long: %1", note.note().get());
 	}
 
 	return "";
diff --git a/src/verify.h b/src/verify.h
index ab9e9aac..c56cfb9d 100644
--- a/src/verify.h
+++ b/src/verify.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -77,6 +77,10 @@ public:
 		MISMATCHED_STANDARD,
 		/** Some XML fails to validate against the XSD/DTD */
 		XML_VALIDATION_ERROR,
+		/** An asset's IntrinsicDuration is less than 1 second */
+		INTRINSIC_DURATION_TOO_SMALL,
+		/** An asset's Duration is less than 1 second */
+		DURATION_TOO_SMALL
 	};
 
 	VerificationNote (Type type, Code code)
diff --git a/test/verify_test.cc b/test/verify_test.cc
index b5069023..2ff66f69 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -471,3 +471,25 @@ BOOST_AUTO_TEST_CASE (verify_test13)
 
 	next_verify_test_number++;
 }
+
+/* DCP with a short asset */
+BOOST_AUTO_TEST_CASE (verify_test14)
+{
+	vector<boost::filesystem::path> directories = setup (8, next_verify_test_number);
+	list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, "xsd");
+
+	dump_notes (notes);
+
+	BOOST_REQUIRE_EQUAL (notes.size(), 4);
+	list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+	BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::DURATION_TOO_SMALL);
+	++i;
+	BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL);
+	++i;
+	BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::DURATION_TOO_SMALL);
+	++i;
+	BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL);
+	++i;
+	next_verify_test_number++;
+}
+