Move private_data into TestPaths

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index 390ecf444e66c7c56511929bbff3b515e12be55b..a242d620bbe35bf97f73d3f4f7dff6d5bed8ab83 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -40,6 +40,7 @@
 #include "lib/cross.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
+#include <boost/algorithm/string.hpp>
 #include <iostream>
 
 using std::cout;
@@ -204,7 +205,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test)
 BOOST_AUTO_TEST_CASE (player_seek_test)
 {
        shared_ptr<Film> film (new Film (optional<boost::filesystem::path>()));
-       shared_ptr<DCPContent> dcp (new DCPContent(private_data / "awkward_subs"));
+       shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data / "awkward_subs"));
        film->examine_and_add_content (dcp, true);
        BOOST_REQUIRE (!wait_for_jobs ());
        dcp->only_text()->set_use (true);
@@ -235,7 +236,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
 BOOST_AUTO_TEST_CASE (player_seek_test2)
 {
        shared_ptr<Film> film (new Film (optional<boost::filesystem::path>()));
-       shared_ptr<DCPContent> dcp (new DCPContent(private_data / "awkward_subs2"));
+       shared_ptr<DCPContent> dcp (new DCPContent(TestPaths::private_data / "awkward_subs2"));
        film->examine_and_add_content (dcp, true);
        BOOST_REQUIRE (!wait_for_jobs ());
        dcp->only_text()->set_use (true);
@@ -301,7 +302,7 @@ store (list<Sub>* out, PlayerText text, TextType type, optional<DCPTextTrack> tr
 BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
 {
        shared_ptr<Film> film = new_test_film2 ("player_ignore_video_and_audio_test");
-       shared_ptr<Content> ff = content_factory(private_data / "boon_telly.mkv").front();
+       shared_ptr<Content> ff = content_factory(TestPaths::private_data / "boon_telly.mkv").front();
        film->examine_and_add_content (ff);
        shared_ptr<Content> text = content_factory("test/data/subrip.srt").front();
        film->examine_and_add_content (text);
@@ -324,7 +325,7 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
 BOOST_AUTO_TEST_CASE (player_trim_crash)
 {
        shared_ptr<Film> film = new_test_film2 ("player_trim_crash");
-       shared_ptr<Content> boon = content_factory(private_data / "boon_telly.mkv").front();
+       shared_ptr<Content> boon = content_factory(TestPaths::private_data / "boon_telly.mkv").front();
        film->examine_and_add_content (boon);
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -416,3 +417,42 @@ BOOST_AUTO_TEST_CASE (player_3d_test_2)
        BOOST_REQUIRE (!wait_for_jobs());
 }
 
+/** Test a crash when there is video-only content at the end of the DCP and a frame-rate conversion is happening;
+ *  #1691.
+ */
+BOOST_AUTO_TEST_CASE (player_silence_at_end_crash)
+{
+       /* 25fps DCP with some audio */
+       shared_ptr<Film> film1 = new_test_film2 ("player_silence_at_end_crash_1");
+       shared_ptr<Content> content1 = content_factory("test/data/flat_red.png").front();
+       film1->examine_and_add_content (content1);
+       BOOST_REQUIRE (!wait_for_jobs());
+       content1->video->set_length (25);
+       film1->set_video_frame_rate (25);
+       film1->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       /* Make another project importing this DCP */
+       shared_ptr<Film> film2 = new_test_film2 ("player_silence_at_end_crash_2");
+       shared_ptr<Content> content2(new DCPContent(film1->dir(film1->dcp_name())));
+       film2->examine_and_add_content (content2);
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       /* and importing just the video MXF on its own at the end */
+       optional<boost::filesystem::path> video;
+       for (boost::filesystem::directory_iterator i(film1->dir(film1->dcp_name())); i != boost::filesystem::directory_iterator(); ++i) {
+               if (boost::starts_with(i->path().filename().string(), "j2c_")) {
+                       video = i->path();
+               }
+       }
+
+       BOOST_REQUIRE (video);
+       shared_ptr<Content> content3 = content_factory(*video).front();
+       film2->examine_and_add_content (content3);
+       BOOST_REQUIRE (!wait_for_jobs());
+       content3->set_position (film2, DCPTime::from_seconds(1.5));
+       film2->set_video_frame_rate (24);
+       std::cout << "Here we go.\n";
+       film2->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+}