X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_pts_offset_test.cc;h=18f89713e756d85e7ed529c434ad118f39811c92;hb=cbecfe7ff652d61608f752239de8d134b052a28f;hp=ccc2a10f2301238d9076304d5ca2bac7f65c4de7;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index ccc2a10f2..18f89713e 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -20,29 +20,27 @@
 
 /** @file  test/ffmpeg_pts_offset_test.cc
  *  @brief Check the computation of _pts_offset in FFmpegDecoder.
+ *  @ingroup specific
  */
 
+#include <boost/test/unit_test.hpp>
 #include "lib/film.h"
 #include "lib/ffmpeg_decoder.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_audio_stream.h"
 #include "lib/audio_content.h"
 #include "test.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 
 using boost::shared_ptr;
-using boost::make_shared;
 
 BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 {
 	shared_ptr<Film> film = new_test_film ("ffmpeg_pts_offset_test");
-	shared_ptr<FFmpegContent> content = make_shared<FFmpegContent> (film, "test/data/test.mp4");
+	shared_ptr<FFmpegContent> content (new 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()));
-	/* Can't use make_shared here */
 	content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
 	content->_video_frame_rate = 24;
 
@@ -50,24 +48,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(), false);
-		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(), false);
-		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(), false);
-		BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ());
+		FFmpegDecoder decoder (film, content, false);
+		BOOST_CHECK_EQUAL (decoder._pts_offset.get(), 0);
 	}
 
 	{
@@ -75,7 +73,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(), false);
+		FFmpegDecoder decoder (film, content, false);
 		BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215), 0.00001);
 	}
 
@@ -84,7 +82,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(), false);
+		FFmpegDecoder decoder (film, content, false);
 		BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1, 0.1);
 	}
 }