Supporter.

[dcpomatic.git] / test / seek_zero_test.cc

diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index c22cadb96e8468f3e48f8fabdda97e7e70694095..faf4c9eac7c35ad5521d5ebb7e7a609446369761 100644 (file)
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -23,6 +23,7 @@
  *  confusing things as it might in ffmpeg_seek_test).
  */
 
+#include <boost/test/unit_test.hpp>
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
@@ -34,8 +35,6 @@
 #include "lib/video_content.h"
 #include "lib/video_decoder.h"
 #include "test.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 using std::cout;
@@ -43,15 +42,14 @@ using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
-using boost::make_shared;
 
 BOOST_AUTO_TEST_CASE (seek_zero_test)
 {
        shared_ptr<Film> film = new_test_film ("seek_zero_test");
        film->set_name ("seek_zero_test");
        film->set_container (Ratio::from_id ("185"));
-       film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
-       shared_ptr<FFmpegContent> content = make_shared<FFmpegContent> (film, "test/data/count300bd48.m2ts");
+       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+       shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
        film->examine_and_add_content (content);
        wait_for_jobs ();
        content->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
@@ -66,7 +64,7 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 
        Frame const first_frame = video_delay.round_up (content->active_video_frame_rate ()).frames_round (content->active_video_frame_rate ());
 
-       FFmpegDecoder decoder (content, film->log(), false);
+       FFmpegDecoder decoder (content, film->log());
        list<ContentVideo> a = decoder.video->get (first_frame, true);
        BOOST_CHECK (a.size() == 1);
        BOOST_CHECK_EQUAL (a.front().frame.index(), first_frame);