X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fframe_rate_test.cc;h=39a64504d70207b60667e908c810be140a47decb;hp=7d3904e740a8b05bf898a2d7cd0efa14e15f52e5;hb=c5c0e55b2d2ec97a8dd96f4d3e93f85d13cc9d84;hpb=ea910e250a0fb3b0ad3ce0cf32dd27b24c17cd1d

diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 7d3904e74..39a64504d 100644
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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
@@ -17,16 +17,23 @@
 
 */
 
+/** @file  test/frame_rate_test.cc
+ *  @brief Tests for FrameRateChange and the computation of the best
+ *  frame rate for the DCP.
+ */
+
 #include <boost/test/unit_test.hpp>
 #include "lib/film.h"
 #include "lib/config.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/playlist.h"
+#include "lib/ffmpeg_audio_stream.h"
+#include "lib/frame_rate_change.h"
 #include "test.h"
 
 using boost::shared_ptr;
 
-/* Test Playlist::best_dcp_frame_rate and FrameRateConversion
+/* Test Playlist::best_dcp_frame_rate and FrameRateChange
    with a single piece of content.
 */
 BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
@@ -186,7 +193,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 	BOOST_CHECK_EQUAL (frc.skip, false);
 	BOOST_CHECK_EQUAL (frc.repeat, 2);
 	BOOST_CHECK_EQUAL (frc.change_speed, true);
-	BOOST_CHECK_CLOSE (frc.speed_up, 2 * 14.99 / 24, 0.1);
+	BOOST_CHECK_CLOSE (frc.speed_up, 24 / (2 * 14.99), 0.1);
 
 	/* Check some conversions with limited DCP targets */
 
@@ -230,13 +237,12 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
 	BOOST_CHECK_EQUAL (film->playlist()->best_dcp_frame_rate(), 25);
 }
 
-
 BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 {
 	shared_ptr<Film> film = new_test_film ("audio_sampling_rate_test");
 	/* 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 ();
 	
 	std::list<int> afr;
@@ -245,46 +251,47 @@ 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);
 	content->_video_frame_rate = 24;
 	film->set_video_frame_rate (24);
-	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
-	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 48000);
+	stream->_frame_rate = 48000;
+	BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 48000);
 
-	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)));
-	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 48000);
+	stream->_frame_rate = 44100;
+	BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), 48000);
 
-	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 80000, 0)));
-	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 96000);
+	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<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
-	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 47952);
+	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<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
-	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 47952);
+	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<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
-	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 50000);
+	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<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)));
-	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 50000);
+	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<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 16000, 0)));
-	/* The FrameRateChange within output_audio_frame_rate should choose to double-up
+	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->output_audio_frame_rate(), rint (48000 * 2 * 14.99 / 25));
+	BOOST_CHECK_EQUAL (content->resampled_audio_frame_rate(), rint (48000 * 2 * 14.99 / 25));
 }
-