X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_audio_test.cc;h=e9b0c70394b2ecf62d10f24284032b50f2f40fea;hb=9e67ff28e3ccd3a3e51e62f400455c7046f8b6bd;hp=1e9048584de40d9d0dee5e7ba7c69ccc7a6b99c1;hpb=0a3de908ae0f62dd8d7d5aaaa96e2ddab891b5a8;p=dcpomatic.git

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 1e9048584..e9b0c7039 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 specific
  */
 
 #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>
@@ -45,12 +48,10 @@ 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 (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);
@@ -58,7 +59,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 	film->make_dcp ();
 	film->write_metadata ();
 
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	boost::filesystem::path path = "build/test";
 	path /= "ffmpeg_audio_test";
@@ -122,3 +123,28 @@ 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_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));
+	player->set_fast ();
+	while (!player->pass ()) {}
+}