Merge.

[dcpomatic.git] / test / frame_rate_test.cc

diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 0133431eea78234b4197fbb292be9b3271fbb98f..a318ada11e66c6e844bf3b8ae6bdef1e53755249 100644 (file)
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -235,6 +235,14 @@ 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)
@@ -293,5 +301,5 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
        /* 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));
+       BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), lrint (48000 * 2 * 14.99 / 25));
 }