X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fcontent_test.cc;h=1e143f8e4db2317773a251addf1a17955402459b;hb=c697b40192bb4c9df7b0ac75f1edb7134ef47f8f;hp=31484c0d234c676afcd261f9f23ac896466e9085;hpb=10b6c135f34b9d5168142d0a8c3e06f4d91dae4b;p=dcpomatic.git

diff --git a/test/content_test.cc b/test/content_test.cc
index 31484c0d2..1e143f8e4 100644
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -32,6 +32,7 @@
 #include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 /** There has been garbled audio with this piece of content */
 BOOST_AUTO_TEST_CASE (content_test1)
@@ -41,7 +42,7 @@ BOOST_AUTO_TEST_CASE (content_test1)
 	film->set_name ("content_test1");
 	film->set_container (Ratio::from_id ("185"));
 
-	shared_ptr<Content> content = content_factory(film, private_data / "demo_sound_bug.mkv").front ();
+	shared_ptr<Content> content = content_factory(TestPaths::private_data / "demo_sound_bug.mkv").front ();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	film->make_dcp ();
@@ -69,7 +70,7 @@ 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();
+	shared_ptr<Content> content = content_factory("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));
@@ -83,7 +84,7 @@ 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();
+	shared_ptr<Content> content = content_factory("test/data/red_24.mp4").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -104,15 +105,15 @@ BOOST_AUTO_TEST_CASE (content_test3)
 	/* Position */
 
 	/* 12 frames */
-	content->set_position (DCPTime::from_seconds (12.0 / 24.0));
+	content->set_position (film, 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));
+	content->set_position (film, 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));
+	content->set_position (film, DCPTime::from_seconds(13.9 / 24.0));
 	BOOST_CHECK (content->position() == DCPTime::from_seconds (14.0 / 24.0));
 
 	content->set_video_frame_rate (25);
@@ -120,9 +121,32 @@ BOOST_AUTO_TEST_CASE (content_test3)
 	/* 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));
+}
+
+
+/** Content containing video will have its length rounded to the nearest video frame */
+BOOST_AUTO_TEST_CASE (content_test4)
+{
+	shared_ptr<Film> film = new_test_film2 ("content_test4");
+
+	shared_ptr<Content> video = content_factory("test/data/count300bd24.m2ts").front();
+	film->examine_and_add_content (video);
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	video->set_trim_end (dcpomatic::ContentTime(3000));
+	BOOST_CHECK (video->length_after_trim(film) == DCPTime::from_frames(299, 24));
+}
+
+
+/** Content containing no video will not have its length rounded to the nearest video frame */
+BOOST_AUTO_TEST_CASE (content_test5)
+{
+	shared_ptr<Film> film = new_test_film2 ("content_test5");
 
-	/* Likewise position */
+	shared_ptr<Content> audio = content_factory("test/data/sine_16_48_220_10.wav").front();
+	film->examine_and_add_content (audio);
+	BOOST_REQUIRE (!wait_for_jobs());
 
-	cout << to_string(content->position()) << " " << DCPTime::from_seconds(15.0 / 25.0) << "\n";
-	BOOST_CHECK (content->position() == DCPTime::from_seconds (15.0 / 25.0));
+	audio->set_trim_end (dcpomatic::ContentTime(3000));
+	BOOST_CHECK (audio->length_after_trim(film) == DCPTime(957000));
 }