X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fframe_rate_test.cc;h=76a8ed5cbefe56c0872161126de9a81a926ef6ac;hp=78d092b94179b14fd07dda0bdb7c6bfe621ee9e0;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=6f344b876689a1234a5eb75041882f06f5d9fe5c diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc index 78d092b94..76a8ed5cb 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 @@ -30,9 +32,10 @@ #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. @@ -41,9 +44,9 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) { shared_ptr 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 (); + shared_ptr content (new FFmpegContent("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 */ @@ -53,7 +56,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) afr.push_back (30); Config::instance()->set_allowed_dcp_frame_rates (afr); - content->video->_video_frame_rate = 60; + content->_video_frame_rate = 60; int best = film->best_video_frame_rate (); FrameRateChange frc = FrameRateChange (60, best); BOOST_CHECK_EQUAL (best, 30); @@ -62,7 +65,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, false); BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); - content->video->_video_frame_rate = 50; + content->_video_frame_rate = 50; best = film->best_video_frame_rate (); frc = FrameRateChange (50, best); BOOST_CHECK_EQUAL (best, 25); @@ -71,7 +74,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, false); BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); - content->video->_video_frame_rate = 48; + content->_video_frame_rate = 48; best = film->best_video_frame_rate (); frc = FrameRateChange (48, best); BOOST_CHECK_EQUAL (best, 24); @@ -80,7 +83,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, false); BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); - content->video->_video_frame_rate = 30; + content->_video_frame_rate = 30; best = film->best_video_frame_rate (); frc = FrameRateChange (30, best); BOOST_CHECK_EQUAL (best, 30); @@ -89,7 +92,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, false); BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); - content->video->_video_frame_rate = 29.97; + content->_video_frame_rate = 29.97; best = film->best_video_frame_rate (); frc = FrameRateChange (29.97, best); BOOST_CHECK_EQUAL (best, 30); @@ -98,7 +101,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, true); BOOST_CHECK_CLOSE (frc.speed_up, 30 / 29.97, 0.1); - content->video->_video_frame_rate = 25; + content->_video_frame_rate = 25; best = film->best_video_frame_rate (); frc = FrameRateChange (25, best); BOOST_CHECK_EQUAL (best, 25); @@ -107,7 +110,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, false); BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); - content->video->_video_frame_rate = 24; + content->_video_frame_rate = 24; best = film->best_video_frame_rate (); frc = FrameRateChange (24, best); BOOST_CHECK_EQUAL (best, 24); @@ -116,7 +119,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, false); BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); - content->video->_video_frame_rate = 14.5; + content->_video_frame_rate = 14.5; best = film->best_video_frame_rate (); frc = FrameRateChange (14.5, best); BOOST_CHECK_EQUAL (best, 30); @@ -125,7 +128,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, true); BOOST_CHECK_CLOSE (frc.speed_up, 15 / 14.5, 0.1); - content->video->_video_frame_rate = 12.6; + content->_video_frame_rate = 12.6; best = film->best_video_frame_rate (); frc = FrameRateChange (12.6, best); BOOST_CHECK_EQUAL (best, 25); @@ -134,7 +137,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, true); BOOST_CHECK_CLOSE (frc.speed_up, 25 / 25.2, 0.1); - content->video->_video_frame_rate = 12.4; + content->_video_frame_rate = 12.4; best = film->best_video_frame_rate (); frc = FrameRateChange (12.4, best); BOOST_CHECK_EQUAL (best, 25); @@ -143,7 +146,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, true); BOOST_CHECK_CLOSE (frc.speed_up, 25 / 24.8, 0.1); - content->video->_video_frame_rate = 12; + content->_video_frame_rate = 12; best = film->best_video_frame_rate (); frc = FrameRateChange (12, best); BOOST_CHECK_EQUAL (best, 24); @@ -161,8 +164,8 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) afr.push_back (60); Config::instance()->set_allowed_dcp_frame_rates (afr); - content->video->_video_frame_rate = 60; - best = film->best_video_frame_rate (); + content->_video_frame_rate = 60; + best = film->playlist()->best_video_frame_rate (); frc = FrameRateChange (60, best); BOOST_CHECK_EQUAL (best, 60); BOOST_CHECK_EQUAL (frc.skip, false); @@ -170,8 +173,8 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, false); BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); - content->video->_video_frame_rate = 50; - best = film->best_video_frame_rate (); + content->_video_frame_rate = 50; + best = film->playlist()->best_video_frame_rate (); frc = FrameRateChange (50, best); BOOST_CHECK_EQUAL (best, 50); BOOST_CHECK_EQUAL (frc.skip, false); @@ -179,8 +182,8 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_EQUAL (frc.change_speed, false); BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); - content->video->_video_frame_rate = 48; - best = film->best_video_frame_rate (); + content->_video_frame_rate = 48; + best = film->playlist()->best_video_frame_rate (); frc = FrameRateChange (48, best); BOOST_CHECK_EQUAL (best, 48); BOOST_CHECK_EQUAL (frc.skip, false); @@ -202,7 +205,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) afr.push_back (24); Config::instance()->set_allowed_dcp_frame_rates (afr); - content->video->_video_frame_rate = 25; + content->_video_frame_rate = 25; best = film->best_video_frame_rate (); frc = FrameRateChange (25, best); BOOST_CHECK_EQUAL (best, 24); @@ -219,11 +222,11 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double) { shared_ptr 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 (); + shared_ptr A (new FFmpegContent("test/data/test.mp4")); + film->examine_and_add_content (A); + shared_ptr B (new FFmpegContent("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 */ @@ -233,16 +236,16 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double) afr.push_back (30); Config::instance()->set_allowed_dcp_frame_rates (afr); - A->video->_video_frame_rate = 30; - B->video->_video_frame_rate = 24; + A->_video_frame_rate = 30; + B->_video_frame_rate = 24; BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 25); - A->video->_video_frame_rate = 24; - B->video->_video_frame_rate = 24; + A->_video_frame_rate = 24; + B->_video_frame_rate = 24; BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24); - A->video->_video_frame_rate = 24; - B->video->_video_frame_rate = 48; + A->_video_frame_rate = 24; + B->_video_frame_rate = 48; BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24); } @@ -250,9 +253,9 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) { shared_ptr 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")); + shared_ptr content (new FFmpegContent("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); @@ -260,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); - content->video->_video_frame_rate = 24; + shared_ptr stream (new FFmpegAudioStream ("foo", 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->_video_frame_rate = 23.976; + 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->_video_frame_rate = 29.97; + 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->_video_frame_rate = 25; + 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->_video_frame_rate = 25; + 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->_video_frame_rate = 14.99; + 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(), lrint (48000 * 2 * 14.99 / 25)); + BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), lrint (48000 * 2 * 14.99 / 25)); }