/** @file test/frame_rate_test.cc
* @brief Tests for FrameRateChange and the computation of the best
* frame rate for the DCP.
- * @ingroup specific
+ * @ingroup feature
*/
#include <boost/test/unit_test.hpp>
#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.
/* Get any piece of content, it doesn't matter what */
shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/test.mp4"));
film->examine_and_add_content (content);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
/* Run some tests with a limited range of allowed rates */
Config::instance()->set_allowed_dcp_frame_rates (afr);
content->_video_frame_rate = 60;
- best = film->best_video_frame_rate ();
+ best = film->playlist()->best_video_frame_rate ();
frc = FrameRateChange (60, best);
BOOST_CHECK_EQUAL (best, 60);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
content->_video_frame_rate = 50;
- best = film->best_video_frame_rate ();
+ best = film->playlist()->best_video_frame_rate ();
frc = FrameRateChange (50, best);
BOOST_CHECK_EQUAL (best, 50);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
content->_video_frame_rate = 48;
- best = film->best_video_frame_rate ();
+ best = film->playlist()->best_video_frame_rate ();
frc = FrameRateChange (48, best);
BOOST_CHECK_EQUAL (best, 48);
BOOST_CHECK_EQUAL (frc.skip, false);
film->examine_and_add_content (A);
shared_ptr<FFmpegContent> B (new FFmpegContent("test/data/test.mp4"));
film->examine_and_add_content (B);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
/* Run some tests with a limited range of allowed rates */
/* Get any piece of content, it doesn't matter what */
shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/test.mp4"));
film->examine_and_add_content (content);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
std::list<int> afr;
afr.push_back (24);
BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 48000);
stream->_frame_rate = 80000;
- BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 96000);
+ BOOST_CHECK_EQUAL (content->audio->resampled_frame_rate(film), 48000);
content->_video_frame_rate = 23.976;
film->set_video_frame_rate (24);