X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fcontent_test.cc;h=330bbdc9462a3094d45253816859ab0698651ed6;hb=d9561404372d187ea7813389ac69545de614f259;hp=cc703bfb887b71df605515ec81dcf91b60b1f16b;hpb=dd879e5254c1e005e60ccd135a37f70cb2fe3a75;p=dcpomatic.git

diff --git a/test/content_test.cc b/test/content_test.cc
index cc703bfb8..330bbdc94 100644
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -26,6 +26,7 @@
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
 #include "lib/content_factory.h"
+#include "lib/content.h"
 #include "lib/ratio.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -60,3 +61,68 @@ BOOST_AUTO_TEST_CASE (content_test1)
 
 	check_mxf_audio_file ("test/data/content_test1.mxf", check);
 }
+
+/** Taking some 23.976fps content and trimming 0.5s (in content time) from the start
+ *  has failed in the past; ensure that this is fixed.
+ */
+BOOST_AUTO_TEST_CASE (content_test2)
+{
+	shared_ptr<Film> film = new_test_film2 ("content_test2");
+
+	shared_ptr<Content> content = content_factory(film, "test/data/red_23976.mp4").front();
+	film->examine_and_add_content (content);
+	BOOST_REQUIRE (!wait_for_jobs ());
+	content->set_trim_start(ContentTime::from_seconds(0.5));
+	film->make_dcp ();
+	BOOST_REQUIRE (!wait_for_jobs ());
+}
+
+/** Check that position and start trim of video content is forced to a frame boundary */
+BOOST_AUTO_TEST_CASE (content_test3)
+{
+	shared_ptr<Film> film = new_test_film2 ("content_test3");
+	film->set_sequence (false);
+
+	shared_ptr<Content> content = content_factory(film, "test/data/red_24.mp4").front();
+	film->examine_and_add_content (content);
+	BOOST_REQUIRE (!wait_for_jobs ());
+
+	/* Trim */
+
+	/* 12 frames */
+	content->set_trim_start (ContentTime::from_seconds (12.0 / 24.0));
+	BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (12.0 / 24.0));
+
+	/* 11.2 frames */
+	content->set_trim_start (ContentTime::from_seconds (11.2 / 24.0));
+	BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (11.0 / 24.0));
+
+	/* 13.9 frames */
+	content->set_trim_start (ContentTime::from_seconds (13.9 / 24.0));
+	BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (14.0 / 24.0));
+
+	/* Position */
+
+	/* 12 frames */
+	content->set_position (DCPTime::from_seconds (12.0 / 24.0));
+	BOOST_CHECK (content->position() == DCPTime::from_seconds (12.0 / 24.0));
+
+	/* 11.2 frames */
+	content->set_position (DCPTime::from_seconds (11.2 / 24.0));
+	BOOST_CHECK (content->position() == DCPTime::from_seconds (11.0 / 24.0));
+
+	/* 13.9 frames */
+	content->set_position (DCPTime::from_seconds (13.9 / 24.0));
+	BOOST_CHECK (content->position() == DCPTime::from_seconds (14.0 / 24.0));
+
+	content->set_video_frame_rate (25);
+
+	/* Check that trim is fixed when the content's video frame rate is `forced' */
+
+	BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (15.0 / 25.0));
+
+	/* Likewise position */
+
+	std::cout << to_string(content->position()) << " " << to_string(DCPTime::from_seconds(15.0 / 25.0)) << "\n";
+	BOOST_CHECK (content->position() == DCPTime::from_seconds (15.0 / 25.0));
+}