X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_pts_offset_test.cc;h=4aa4c1d9aadf387e2874d7a4e71d86591743398f;hb=25eb7aa723af004162fc7f95995df250c4e4571b;hp=05c4e15c8dcdce222e14d1b62412c230d94f1aa4;hpb=76f83b97c401c24b3c93baee0665e84be05f43ea;p=dcpomatic.git

diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index 05c4e15c8..4aa4c1d9a 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,13 @@
 
 */
 
+
 /** @file  test/ffmpeg_pts_offset_test.cc
  *  @brief Check the computation of _pts_offset in FFmpegDecoder.
+ *  @ingroup selfcontained
  */
 
+
 #include <boost/test/unit_test.hpp>
 #include "lib/film.h"
 #include "lib/ffmpeg_decoder.h"
@@ -30,16 +33,20 @@
 #include "lib/audio_content.h"
 #include "test.h"
 
-using boost::shared_ptr;
+
+using std::make_shared;
+using std::shared_ptr;
+using namespace dcpomatic;
+
 
 BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 {
-	shared_ptr<Film> film = new_test_film ("ffmpeg_pts_offset_test");
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
+	auto film = new_test_film ("ffmpeg_pts_offset_test");
+	auto content = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
-	content->audio.reset (new AudioContent (content.get()));
+	content->audio = make_shared<AudioContent>(content.get());
 	content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
 	content->_video_frame_rate = 24;
 
@@ -47,24 +54,24 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		/* Sound == video so no offset required */
 		content->_first_video = ContentTime ();
 		content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
-		FFmpegDecoder decoder (content, film->log());
-		BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ());
+		FFmpegDecoder decoder (film, content, false);
+		BOOST_CHECK_EQUAL (decoder._pts_offset.get(), 0);
 	}
 
 	{
 		/* Common offset should be removed */
 		content->_first_video = ContentTime::from_seconds (600);
 		content->ffmpeg_audio_streams().front()->first_audio = ContentTime::from_seconds (600);
-		FFmpegDecoder decoder (content, film->log());
-		BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime::from_seconds (-600));
+		FFmpegDecoder decoder (film, content, false);
+		BOOST_CHECK_EQUAL (decoder._pts_offset.get(), ContentTime::from_seconds(-600).get());
 	}
 
 	{
 		/* Video is on a frame boundary */
 		content->_first_video = ContentTime::from_frames (1, 24);
 		content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
-		FFmpegDecoder decoder (content, film->log());
-		BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ());
+		FFmpegDecoder decoder (film, content, false);
+		BOOST_CHECK_EQUAL (decoder._pts_offset.get(), 0);
 	}
 
 	{
@@ -72,7 +79,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		double const frame = 1.0 / 24.0;
 		content->_first_video = ContentTime::from_seconds (frame + 0.0215);
 		content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
-		FFmpegDecoder decoder (content, film->log());
+		FFmpegDecoder decoder (film, content, false);
 		BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215), 0.00001);
 	}
 
@@ -81,7 +88,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		double const frame = 1.0 / 24.0;
 		content->_first_video = ContentTime::from_seconds (frame + 0.0215 + 4.1);
 		content->ffmpeg_audio_streams().front()->first_audio = ContentTime::from_seconds (4.1);
-		FFmpegDecoder decoder (content, film->log());
+		FFmpegDecoder decoder (film, content, false);
 		BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1, 0.1);
 	}
 }