Various text fixes.

[dcpomatic.git] / test / frame_rate_test.cc

diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 0133431eea78234b4197fbb292be9b3271fbb98f..8a4aed43b250c796ff3d32df5284a84ecbedcbd0 100644 (file)
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     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
@@ -29,6 +29,8 @@
 #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;
@@ -41,7 +43,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
        shared_ptr<Film> film = new_test_film ("best_dcp_frame_rate_test_single");
        /* Get any piece of content, it doesn't matter what */
        shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
-       film->add_content (content);
+       film->examine_and_add_content (content);
        wait_for_jobs ();
 
        /* Run some tests with a limited range of allowed rates */
@@ -219,9 +221,9 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
        shared_ptr<Film> film = new_test_film ("best_dcp_frame_rate_test_double");
        /* Get any old content, it doesn't matter what */
        shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/test.mp4"));
-       film->add_content (A);
+       film->examine_and_add_content (A);
        shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
-       film->add_content (B);
+       film->examine_and_add_content (B);
        wait_for_jobs ();
 
        /* Run some tests with a limited range of allowed rates */
@@ -235,6 +237,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)
@@ -251,47 +261,48 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
        afr.push_back (30);
        Config::instance()->set_allowed_dcp_frame_rates (afr);
 
-       shared_ptr<FFmpegAudioStream> stream (new FFmpegAudioStream ("foo", 0, 0, 0));
-       content->_audio_streams.push_back (stream);
+       shared_ptr<FFmpegAudioStream> 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(), 48000);
 
        stream->_frame_rate = 44100;
-       BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 48000);
+       BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 48000);
 
        stream->_frame_rate = 80000;
-       BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 96000);
+       BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(), 96000);
 
        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(), 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(), 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(), 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(), 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(), lrint (48000 * 2 * 14.99 / 25));
 }