X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_audio_test.cc;h=fc315ec2d4470186d9c8c77eec1c3097a10b8135;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=07e6e0310e91cd3979714043bbfc2bd422fc9e22;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 07e6e0310..fc315ec2d 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -19,7 +19,8 @@
 */
 
 /** @file  test/ffmpeg_audio_test.cc
- *  @brief A simple test of reading audio from an FFmpeg file.
+ *  @brief Test reading audio from an FFmpeg file.
+ *  @ingroup feature
  */
 
 #include "lib/ffmpeg_content.h"
@@ -28,6 +29,8 @@
 #include "lib/video_content.h"
 #include "lib/ratio.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/content_factory.h"
+#include "lib/player.h"
 #include "test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
@@ -37,30 +40,26 @@
 #include <dcp/sound_asset_reader.h>
 #include <dcp/reel.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 
 using std::string;
-using boost::shared_ptr;
-using boost::make_shared;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 {
 	shared_ptr<Film> film = new_test_film ("ffmpeg_audio_test");
 	film->set_name ("ffmpeg_audio_test");
-	shared_ptr<FFmpegContent> c = make_shared<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->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	film->make_dcp ();
 	film->write_metadata ();
 
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	boost::filesystem::path path = "build/test";
 	path /= "ffmpeg_audio_test";
@@ -124,3 +123,43 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 		}
 	}
 }
+
+/** Decode a file containing truehd so we can profile it; this is with the player set to normal */
+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();
+	film->examine_and_add_content (content);
+	BOOST_REQUIRE (!wait_for_jobs ());
+
+	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_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));
+	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()) {});
+}
+