+ make_and_verify_dcp (film);
+}
+
+
+/** Check that position and start trim of video content is forced to a frame boundary */
+BOOST_AUTO_TEST_CASE (content_test3)
+{
+ auto content = content_factory("test/data/red_24.mp4").front();
+ auto film = new_test_film2 ("content_test3", {content});
+ film->set_sequence (false);
+
+ /* 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 (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 (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 (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);
+
+ /* 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)
+{
+ auto film = new_test_film2 ("content_test4");
+
+ auto 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)
+{
+ auto audio = content_factory("test/data/sine_16_48_220_10.wav").front();
+ auto film = new_test_film2 ("content_test5", {audio});
+
+ audio->set_trim_end (dcpomatic::ContentTime(3000));
+
+ BOOST_CHECK (audio->length_after_trim(film) == DCPTime(957000));
+}
+
+
+/** Sync error #1833 */
+BOOST_AUTO_TEST_CASE (content_test6)
+{
+ Cleanup cl;
+
+ auto film = new_test_film2 (
+ "content_test6",
+ { content_factory(TestPaths::private_data() / "fha.mkv").front() },
+ &cl
+ );
+
+ make_and_verify_dcp (film);
+ check_dcp (TestPaths::private_data() / "fha", film);
+
+ cl.run ();
+}
+
+
+/** Reel length error when making the test for #1833 */
+BOOST_AUTO_TEST_CASE (content_test7)
+{
+ auto content = content_factory(TestPaths::private_data() / "clapperboard.mp4").front();
+ auto film = new_test_film2 ("content_test7", {content});
+ content->audio->set_delay (-1000);
+ make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K });