X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fframe_rate_test.cc;h=0133431eea78234b4197fbb292be9b3271fbb98f;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=0ed5a64a7400f4f2aef00de00c6dc06be6ed9097;hpb=c008066160d85b9ec9e5485375d7baaa5d27bda2;p=dcpomatic.git diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc index 0ed5a64a7..0133431ee 100644 --- a/test/frame_rate_test.cc +++ b/test/frame_rate_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,9 +43,9 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) shared_ptr content (new FFmpegContent (film, "test/data/test.mp4")); film->add_content (content); wait_for_jobs (); - + /* Run some tests with a limited range of allowed rates */ - + std::list afr; afr.push_back (24); afr.push_back (25); @@ -53,16 +53,16 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) Config::instance()->set_allowed_dcp_frame_rates (afr); content->_video_frame_rate = 60; - int best = film->playlist()->best_dcp_frame_rate (); + int best = film->best_video_frame_rate (); FrameRateChange frc = FrameRateChange (60, best); BOOST_CHECK_EQUAL (best, 30); BOOST_CHECK_EQUAL (frc.skip, true); BOOST_CHECK_EQUAL (frc.repeat, 1); BOOST_CHECK_EQUAL (frc.change_speed, false); BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); - + content->_video_frame_rate = 50; - best = film->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (50, best); BOOST_CHECK_EQUAL (best, 25); BOOST_CHECK_EQUAL (frc.skip, true); @@ -71,7 +71,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->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (48, best); BOOST_CHECK_EQUAL (best, 24); BOOST_CHECK_EQUAL (frc.skip, true); @@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); content->_video_frame_rate = 30; - best = film->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (30, best); BOOST_CHECK_EQUAL (best, 30); BOOST_CHECK_EQUAL (frc.skip, false); @@ -89,16 +89,16 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); content->_video_frame_rate = 29.97; - best = film->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (29.97, best); BOOST_CHECK_EQUAL (best, 30); BOOST_CHECK_EQUAL (frc.skip, false); BOOST_CHECK_EQUAL (frc.repeat, 1); BOOST_CHECK_EQUAL (frc.change_speed, true); BOOST_CHECK_CLOSE (frc.speed_up, 30 / 29.97, 0.1); - + content->_video_frame_rate = 25; - best = film->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (25, best); BOOST_CHECK_EQUAL (best, 25); BOOST_CHECK_EQUAL (frc.skip, false); @@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); content->_video_frame_rate = 24; - best = film->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (24, best); BOOST_CHECK_EQUAL (best, 24); BOOST_CHECK_EQUAL (frc.skip, false); @@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); content->_video_frame_rate = 14.5; - best = film->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (14.5, best); BOOST_CHECK_EQUAL (best, 30); BOOST_CHECK_EQUAL (frc.skip, false); @@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_CLOSE (frc.speed_up, 15 / 14.5, 0.1); content->_video_frame_rate = 12.6; - best = film->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (12.6, best); BOOST_CHECK_EQUAL (best, 25); BOOST_CHECK_EQUAL (frc.skip, false); @@ -134,7 +134,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_CLOSE (frc.speed_up, 25 / 25.2, 0.1); content->_video_frame_rate = 12.4; - best = film->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (12.4, best); BOOST_CHECK_EQUAL (best, 25); BOOST_CHECK_EQUAL (frc.skip, false); @@ -143,7 +143,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_CLOSE (frc.speed_up, 25 / 24.8, 0.1); content->_video_frame_rate = 12; - best = film->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (12, best); BOOST_CHECK_EQUAL (best, 24); BOOST_CHECK_EQUAL (frc.skip, false); @@ -161,16 +161,16 @@ 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->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (60, best); BOOST_CHECK_EQUAL (best, 60); BOOST_CHECK_EQUAL (frc.skip, false); BOOST_CHECK_EQUAL (frc.repeat, 1); BOOST_CHECK_EQUAL (frc.change_speed, false); BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); - + content->_video_frame_rate = 50; - best = film->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (50, best); BOOST_CHECK_EQUAL (best, 50); BOOST_CHECK_EQUAL (frc.skip, false); @@ -179,7 +179,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->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (48, best); BOOST_CHECK_EQUAL (best, 48); BOOST_CHECK_EQUAL (frc.skip, false); @@ -188,7 +188,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1); /* Check some out-there conversions (not the best) */ - + frc = FrameRateChange (14.99, 24); BOOST_CHECK_EQUAL (frc.skip, false); BOOST_CHECK_EQUAL (frc.repeat, 2); @@ -202,7 +202,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single) Config::instance()->set_allowed_dcp_frame_rates (afr); content->_video_frame_rate = 25; - best = film->playlist()->best_dcp_frame_rate (); + best = film->best_video_frame_rate (); frc = FrameRateChange (25, best); BOOST_CHECK_EQUAL (best, 24); BOOST_CHECK_EQUAL (frc.skip, false); @@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double) wait_for_jobs (); /* Run some tests with a limited range of allowed rates */ - + std::list afr; afr.push_back (24); afr.push_back (25); @@ -234,64 +234,64 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double) A->_video_frame_rate = 30; B->_video_frame_rate = 24; - BOOST_CHECK_EQUAL (film->playlist()->best_dcp_frame_rate(), 25); + BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 25); } - 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")); - film->examine_and_add_content (content, true); + film->examine_and_add_content (content); wait_for_jobs (); - + std::list afr; afr.push_back (24); afr.push_back (25); 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_frame_rate = 24; film->set_video_frame_rate (24); - content->set_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 48000, 0))); + stream->_frame_rate = 48000; BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 48000); - content->set_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 44100, 0))); + stream->_frame_rate = 44100; BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 48000); - content->set_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 80000, 0))); + stream->_frame_rate = 80000; BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 96000); content->_video_frame_rate = 23.976; film->set_video_frame_rate (24); - content->set_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 48000, 0))); + stream->_frame_rate = 48000; BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 47952); content->_video_frame_rate = 29.97; film->set_video_frame_rate (30); BOOST_CHECK_EQUAL (film->video_frame_rate (), 30); - content->set_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 48000, 0))); + stream->_frame_rate = 48000; BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 47952); content->_video_frame_rate = 25; film->set_video_frame_rate (24); - content->set_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 48000, 0))); + stream->_frame_rate = 48000; BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 50000); content->_video_frame_rate = 25; film->set_video_frame_rate (24); - content->set_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 44100, 0))); + stream->_frame_rate = 44100; BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 50000); /* Check some out-there conversions (not the best) */ - + content->_video_frame_rate = 14.99; film->set_video_frame_rate (25); - content->set_audio_stream (shared_ptr (new FFmpegAudioStream ("a", 42, 16000, 0))); + stream->_frame_rate = 16000; /* The FrameRateChange within resampled_audio_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)); } -