X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_audio_test.cc;h=a54ffa0811f8d11850c51426ed43ce43e1dad271;hb=5b6b01ea778064a0b0125ea8ebd9272a534cccd2;hp=e9b0c70394b2ecf62d10f24284032b50f2f40fea;hpb=15a83d720780d58f905d40f8493cdcb86596eaee;p=dcpomatic.git

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index e9b0c7039..a54ffa081 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/ffmpeg_audio_test.cc
  *  @brief Test reading audio from an FFmpeg file.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "lib/ffmpeg_content.h"
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE (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(TestPaths::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 ());
 
@@ -139,8 +139,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
 /** 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(TestPaths::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 ());
 
@@ -148,3 +148,18 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
 	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()) {});
+}
+