X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fframe_rate_test.cc;h=610ac03809abf23e61610015d24e9bd7e0671330;hb=f3617efde1751ac9e55f692369dc4ba3c6350ca8;hp=490836a465500cca08a7d5c8cf10e4e499f1ff2c;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc index 490836a46..610ac0380 100644 --- a/test/frame_rate_test.cc +++ b/test/frame_rate_test.cc @@ -21,8 +21,10 @@ /** @file test/frame_rate_test.cc * @brief Tests for FrameRateChange and the computation of the best * frame rate for the DCP. + * @ingroup feature */ +#include #include "lib/film.h" #include "lib/config.h" #include "lib/ffmpeg_content.h" @@ -32,22 +34,19 @@ #include "lib/video_content.h" #include "lib/audio_content.h" #include "test.h" -#include -#include -using boost::shared_ptr; -using boost::make_shared; +using std::shared_ptr; /* Test Playlist::best_dcp_frame_rate and FrameRateChange with a single piece of content. */ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) { - shared_ptr film = new_test_film ("best_dcp_frame_rate_test_single"); + auto film = new_test_film("best_dcp_frame_rate_test_single"); /* Get any piece of content, it doesn't matter what */ - shared_ptr content = make_shared (film, "test/data/test.mp4"); + auto content = std::make_shared("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 */ @@ -59,7 +58,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) content->_video_frame_rate = 60; int best = film->best_video_frame_rate (); - FrameRateChange frc = FrameRateChange (60, best); + auto frc = FrameRateChange(60, best); BOOST_CHECK_EQUAL (best, 30); BOOST_CHECK_EQUAL (frc.skip, true); BOOST_CHECK_EQUAL (frc.repeat, 1); @@ -166,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); @@ -175,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); @@ -184,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,13 +220,13 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) */ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double) { - shared_ptr film = new_test_film ("best_dcp_frame_rate_test_double"); + auto film = new_test_film("best_dcp_frame_rate_test_double"); /* Get any old content, it doesn't matter what */ - shared_ptr A = make_shared (film, "test/data/test.mp4"); + auto A = std::make_shared("test/data/test.mp4"); film->examine_and_add_content (A); - shared_ptr B = make_shared (film, "test/data/test.mp4"); + auto B = std::make_shared("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,11 +251,11 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double) BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) { - shared_ptr film = new_test_film ("audio_sampling_rate_test"); + auto film = new_test_film("audio_sampling_rate_test"); /* Get any piece of content, it doesn't matter what */ - shared_ptr content = make_shared (film, "test/data/test.mp4"); + auto content = std::make_shared("test/data/test.mp4"); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); std::list afr; afr.push_back (24); @@ -264,40 +263,40 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) afr.push_back (30); Config::instance()->set_allowed_dcp_frame_rates (afr); - shared_ptr stream = make_shared ("foo", 0, 0, 0, 0); + auto stream = std::make_shared("foo", 0, 0, 0, 0, 0); content->audio.reset (new AudioContent (content.get())); content->audio->add_stream (stream); 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) */ @@ -307,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)); }