X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fframe_rate_test.cc;h=610ac03809abf23e61610015d24e9bd7e0671330;hb=f3617efde1751ac9e55f692369dc4ba3c6350ca8;hp=0133431eea78234b4197fbb292be9b3271fbb98f;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc index 0133431ee..610ac0380 100644 --- a/test/frame_rate_test.cc +++ b/test/frame_rate_test.cc @@ -1,25 +1,27 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ /** @file test/frame_rate_test.cc * @brief Tests for FrameRateChange and the computation of the best * frame rate for the DCP. + * @ingroup feature */ #include @@ -29,20 +31,22 @@ #include "lib/playlist.h" #include "lib/ffmpeg_audio_stream.h" #include "lib/frame_rate_change.h" +#include "lib/video_content.h" +#include "lib/audio_content.h" #include "test.h" -using boost::shared_ptr; +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 (new FFmpegContent (film, "test/data/test.mp4")); - film->add_content (content); - wait_for_jobs (); + auto content = std::make_shared("test/data/test.mp4"); + film->examine_and_add_content (content); + BOOST_REQUIRE (!wait_for_jobs()); /* Run some tests with a limited range of allowed rates */ @@ -54,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); @@ -161,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); @@ -170,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); @@ -179,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); @@ -216,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 (new FFmpegContent (film, "test/data/test.mp4")); - film->add_content (A); - shared_ptr B (new FFmpegContent (film, "test/data/test.mp4")); - film->add_content (B); - wait_for_jobs (); + auto A = std::make_shared("test/data/test.mp4"); + film->examine_and_add_content (A); + auto B = std::make_shared("test/data/test.mp4"); + film->examine_and_add_content (B); + BOOST_REQUIRE (!wait_for_jobs()); /* Run some tests with a limited range of allowed rates */ @@ -235,15 +239,23 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double) A->_video_frame_rate = 30; B->_video_frame_rate = 24; BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 25); + + A->_video_frame_rate = 24; + B->_video_frame_rate = 24; + BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24); + + A->_video_frame_rate = 24; + B->_video_frame_rate = 48; + BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24); } 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 (new FFmpegContent (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); @@ -251,47 +263,48 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) afr.push_back (30); Config::instance()->set_allowed_dcp_frame_rates (afr); - shared_ptr stream (new FFmpegAudioStream ("foo", 0, 0, 0)); - content->_audio_streams.push_back (stream); + 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->resampled_audio_frame_rate(), 48000); + BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 48000); stream->_frame_rate = 44100; - BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 48000); + BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 48000); stream->_frame_rate = 80000; - BOOST_CHECK_EQUAL (content->resampled_audio_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->resampled_audio_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->resampled_audio_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->resampled_audio_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->resampled_audio_frame_rate(), 50000); + BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 50000); /* Check some out-there conversions (not the best) */ content->_video_frame_rate = 14.99; film->set_video_frame_rate (25); stream->_frame_rate = 16000; - /* The FrameRateChange within resampled_audio_frame_rate should choose to double-up + /* 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->resampled_audio_frame_rate(), rint (48000 * 2 * 14.99 / 25)); + BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), lrint (48000 * 2 * 14.99 / 25)); }