{
shared_ptr<Film> film = new_test_film ("ffmpeg_audio_test");
film->set_name ("ffmpeg_audio_test");
- shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/staircase.mov"));
+ shared_ptr<FFmpegContent> c (new FFmpegContent ("test/data/staircase.mov"));
film->examine_and_add_content (c);
- wait_for_jobs ();
-
- c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+ BOOST_REQUIRE (!wait_for_jobs());
film->set_container (Ratio::from_id ("185"));
film->set_audio_channels (6);
film->make_dcp ();
film->write_metadata ();
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
boost::filesystem::path path = "build/test";
path /= "ffmpeg_audio_test";
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
{
shared_ptr<Film> film = new_test_film2 ("ffmpeg_audio_test2");
- shared_ptr<Content> content = content_factory(film, private_data / "wayne.mkv").front();
+ shared_ptr<Content> content = content_factory(TestPaths::private_data() / "wayne.mkv").front();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
- shared_ptr<Player> player (new Player (film, film->playlist ()));
+ shared_ptr<Player> player (new Player(film));
while (!player->pass ()) {}
}
/** Decode a file containing truehd so we can profile it; this is with the player set to fast */
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
{
- shared_ptr<Film> film = new_test_film2 ("ffmpeg_audio_test2");
- shared_ptr<Content> content = content_factory(film, private_data / "wayne.mkv").front();
+ shared_ptr<Film> film = new_test_film2 ("ffmpeg_audio_test3");
+ shared_ptr<Content> content = content_factory(TestPaths::private_data() / "wayne.mkv").front();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
- shared_ptr<Player> player (new Player (film, film->playlist ()));
+ shared_ptr<Player> player (new Player(film));
player->set_fast ();
while (!player->pass ()) {}
}
+
+
+/** Decode a file whose audio previously crashed DCP-o-matic (#1857) */
+BOOST_AUTO_TEST_CASE (ffmpeg_audio_test4)
+{
+ shared_ptr<Film> film = new_test_film2 ("ffmpeg_audio_test4");
+ shared_ptr<Content> content = content_factory(TestPaths::private_data() / "Actuellement aout 2020.wmv").front();
+ film->examine_and_add_content (content);
+ BOOST_REQUIRE (!wait_for_jobs ());
+
+ shared_ptr<Player> player (new Player(film));
+ player->set_fast ();
+ BOOST_CHECK_NO_THROW (while (!player->pass()) {});
+}
+