X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fframe_rate_test.cc;h=d54868b3fbde8ca6ee4ec921cd6fdd6c25b12d17;hb=3b352d6c49e433f82212e7d3f7ae8ccdc28566dd;hp=90216af5cfa5b3a800031a42f769e768aedce351;hpb=0fabbb1680b5042570d50a2276004e2c0e62321c;p=dcpomatic.git diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc index 90216af5c..d54868b3f 100644 --- a/test/frame_rate_test.cc +++ b/test/frame_rate_test.cc @@ -18,24 +18,26 @@ */ + /** @file test/frame_rate_test.cc * @brief Tests for FrameRateChange and the computation of the best * frame rate for the DCP. * @ingroup feature */ -#include -#include "lib/film.h" + +#include "lib/audio_content.h" #include "lib/config.h" -#include "lib/ffmpeg_content.h" -#include "lib/playlist.h" #include "lib/ffmpeg_audio_stream.h" +#include "lib/ffmpeg_content.h" +#include "lib/film.h" #include "lib/frame_rate_change.h" +#include "lib/playlist.h" #include "lib/video_content.h" -#include "lib/audio_content.h" #include "test.h" +#include + -using std::shared_ptr; /* Test Playlist::best_dcp_frame_rate and FrameRateChange with a single piece of content. @@ -263,7 +265,7 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) afr.push_back (30); Config::instance()->set_allowed_dcp_frame_rates (afr); - shared_ptr stream (new FFmpegAudioStream ("foo", 0, 0, 0, 0)); + auto stream = std::make_shared("foo", 0, 0, 0, 0, 0); content->audio.reset (new AudioContent (content.get())); content->audio->add_stream (stream); content->_video_frame_rate = 24;