Fix crash with sub-sample push parts in AudioMerger.

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index a7e944cd4b0fbe57e62a414d7270d6eafc5c5068..b2b32ba2b160ac08dcd0e82441cfe6b63c4b7d00 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -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;
@@ -344,3 +345,114 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
 
        butler->rethrow ();
 }
+
+/** Test a crash when the gap between the last audio and the start of a silent period is more than 1 sample */
+BOOST_AUTO_TEST_CASE (player_silence_crash)
+{
+       shared_ptr<Film> film = new_test_film2 ("player_silence_crash");
+       shared_ptr<Content> sine = content_factory("test/data/impulse_train.wav").front();
+       film->examine_and_add_content (sine);
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       sine->set_video_frame_rate (23.976);
+       film->write_metadata ();
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+}
+
+/** Test a crash when processing a 3D DCP */
+BOOST_AUTO_TEST_CASE (player_3d_test_1)
+{
+       shared_ptr<Film> film = new_test_film2 ("player_3d_test_1a");
+       shared_ptr<Content> left = content_factory("test/data/flat_red.png").front();
+       film->examine_and_add_content (left);
+       shared_ptr<Content> right = content_factory("test/data/flat_blue.png").front();
+       film->examine_and_add_content (right);
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       left->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
+       left->set_position (film, DCPTime());
+       right->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
+       right->set_position (film, DCPTime());
+       film->set_three_d (true);
+
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       shared_ptr<Film> film2 = new_test_film2 ("player_3d_test_1b");
+       shared_ptr<Content> dcp(new DCPContent(film->dir(film->dcp_name())));
+       film2->examine_and_add_content (dcp);
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       film2->set_three_d (true);
+       film2->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+}
+
+/** Test a crash when processing a 3D DCP as content in a 2D project */
+BOOST_AUTO_TEST_CASE (player_3d_test_2)
+{
+       shared_ptr<Film> film = new_test_film2 ("player_3d_test_2a");
+       shared_ptr<Content> left = content_factory("test/data/flat_red.png").front();
+       film->examine_and_add_content (left);
+       shared_ptr<Content> right = content_factory("test/data/flat_blue.png").front();
+       film->examine_and_add_content (right);
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       left->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
+       left->set_position (film, DCPTime());
+       right->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
+       right->set_position (film, DCPTime());
+       film->set_three_d (true);
+
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       shared_ptr<Film> film2 = new_test_film2 ("player_3d_test_2b");
+       shared_ptr<Content> dcp(new DCPContent(film->dir(film->dcp_name())));
+       film2->examine_and_add_content (dcp);
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       film2->make_dcp ();
+       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());
+}