X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fffmpeg_pts_offset_test.cc;h=1d36192194e597bb96e117802fffe44f20609cbb;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hp=bdc46f6d91834474f9d125dfc609b4de06640b64;hpb=c31b9542c58ae1cbfae7ec3ba4911359fd010ba2;p=dcpomatic.git

diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index bdc46f6d9..1d3619219 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -36,7 +36,7 @@ using boost::shared_ptr;
 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"));
+	shared_ptr<FFmpegContent> content (new FFmpegContent ("test/data/test.mp4"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
@@ -48,7 +48,7 @@ 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);
+		FFmpegDecoder decoder (film, content, false);
 		BOOST_CHECK_EQUAL (decoder._pts_offset.get(), 0);
 	}
 
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		/* 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);
+		FFmpegDecoder decoder (film, content, false);
 		BOOST_CHECK_EQUAL (decoder._pts_offset.get(), ContentTime::from_seconds(-600).get());
 	}
 
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		/* 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);
+		FFmpegDecoder decoder (film, content, false);
 		BOOST_CHECK_EQUAL (decoder._pts_offset.get(), 0);
 	}
 
@@ -73,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);
 	}
 
@@ -82,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);
 	}
 }