X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fframe_rate_test.cc;h=292dff8dbb05b2b290cb152e326023d9f9120b89;hp=592b7af8b5ca4ce17228fb3f4ec88f72b55cfc98;hb=95f4d8740de74cdecf6658ab2607c0af9732904e;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05

diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 592b7af8b..292dff8db 100644
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -21,6 +21,7 @@
 /** @file  test/frame_rate_test.cc
  *  @brief Tests for FrameRateChange and the computation of the best
  *  frame rate for the DCP.
+ *  @ingroup specific
  */
 
 #include <boost/test/unit_test.hpp>
@@ -43,9 +44,9 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 {
 	shared_ptr<Film> film = new_test_film ("best_dcp_frame_rate_test_single");
 	/* Get any piece of content, it doesn't matter what */
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/test.mp4"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Run some tests with a limited range of allowed rates */
 
@@ -164,7 +165,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
 	content->_video_frame_rate = 60;
-	best = film->best_video_frame_rate ();
+	best = film->playlist()->best_video_frame_rate ();
 	frc = FrameRateChange (60, best);
 	BOOST_CHECK_EQUAL (best, 60);
 	BOOST_CHECK_EQUAL (frc.skip, false);
@@ -173,7 +174,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
 	content->_video_frame_rate = 50;
-	best = film->best_video_frame_rate ();
+	best = film->playlist()->best_video_frame_rate ();
 	frc = FrameRateChange (50, best);
 	BOOST_CHECK_EQUAL (best, 50);
 	BOOST_CHECK_EQUAL (frc.skip, false);
@@ -182,7 +183,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
 
 	content->_video_frame_rate = 48;
-	best = film->best_video_frame_rate ();
+	best = film->playlist()->best_video_frame_rate ();
 	frc = FrameRateChange (48, best);
 	BOOST_CHECK_EQUAL (best, 48);
 	BOOST_CHECK_EQUAL (frc.skip, false);
@@ -221,11 +222,11 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
 {
 	shared_ptr<Film> film = new_test_film ("best_dcp_frame_rate_test_double");
 	/* Get any old content, it doesn't matter what */
-	shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> A (new FFmpegContent("test/data/test.mp4"));
 	film->examine_and_add_content (A);
-	shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> B (new FFmpegContent("test/data/test.mp4"));
 	film->examine_and_add_content (B);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Run some tests with a limited range of allowed rates */
 
@@ -252,9 +253,9 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 {
 	shared_ptr<Film> film = new_test_film ("audio_sampling_rate_test");
 	/* Get any piece of content, it doesn't matter what */
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/test.mp4"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	std::list<int> afr;
 	afr.push_back (24);
@@ -268,34 +269,34 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 	content->_video_frame_rate = 24;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
-	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 48000);
+	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 48000);
 
 	stream->_frame_rate = 44100;
-	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 48000);
+	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 48000);
 
 	stream->_frame_rate = 80000;
-	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 96000);
+	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 48000);
 
 	content->_video_frame_rate = 23.976;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
-	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 47952);
+	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 47952);
 
 	content->_video_frame_rate = 29.97;
 	film->set_video_frame_rate (30);
 	BOOST_CHECK_EQUAL (film->video_frame_rate (), 30);
 	stream->_frame_rate = 48000;
-	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 47952);
+	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 47952);
 
 	content->_video_frame_rate = 25;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 48000;
-	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 50000);
+	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 50000);
 
 	content->_video_frame_rate = 25;
 	film->set_video_frame_rate (24);
 	stream->_frame_rate = 44100;
-	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 50000);
+	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 50000);
 
 	/* Check some out-there conversions (not the best) */
 
@@ -305,5 +306,5 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 	/* The FrameRateChange within resampled_frame_rate should choose to double-up
 	   the 14.99 fps video to 30 and then run it slow at 25.
 	*/
-	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), lrint (48000 * 2 * 14.99 / 25));
+	BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), lrint (48000 * 2 * 14.99 / 25));
 }