/*
- 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.
#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>
using boost::shared_ptr;
+using namespace dcpomatic;
/** There has been garbled audio with this piece of content */
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 ();
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("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("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 (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));
+}