X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_pts_offset_test.cc;h=141569217531225e387c31c0f528c68f64c6e968;hb=41e23ec653a771f76f8c2c8addb8724e7026f55a;hp=94e7223ab394641a3a64940e2dac24a1d0e65804;hpb=9e4c091e6ef0f79fab10664e95240de2f14e5702;p=dcpomatic.git

diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index 94e7223ab..141569217 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -26,6 +26,7 @@
 #include "lib/ffmpeg_decoder.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_audio_stream.h"
+#include "lib/audio_content.h"
 #include "test.h"
 
 using boost::shared_ptr;
@@ -34,30 +35,34 @@ 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"));
-	content->_audio_stream.reset (new FFmpegAudioStream);
+	film->examine_and_add_content (content);
+	wait_for_jobs ();
+
+	content->audio.reset (new AudioContent (content.get()));
+	content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
 	content->_video_frame_rate = 24;
 
 	{
 		/* Sound == video so no offset required */
 		content->_first_video = ContentTime ();
-		content->_audio_stream->first_audio = ContentTime ();
-		FFmpegDecoder decoder (content, film->log());
+		content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
+		FFmpegDecoder decoder (content, film->log(), false);
 		BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ());
 	}
 
 	{
 		/* Common offset should be removed */
 		content->_first_video = ContentTime::from_seconds (600);
-		content->_audio_stream->first_audio = ContentTime::from_seconds (600);
-		FFmpegDecoder decoder (content, film->log());
+		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));
 	}
 
 	{
 		/* Video is on a frame boundary */
 		content->_first_video = ContentTime::from_frames (1, 24);
-		content->_audio_stream->first_audio = ContentTime ();
-		FFmpegDecoder decoder (content, film->log());
+		content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
+		FFmpegDecoder decoder (content, film->log(), false);
 		BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ());
 	}
 
@@ -65,8 +70,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		/* Video is off a frame boundary */
 		double const frame = 1.0 / 24.0;
 		content->_first_video = ContentTime::from_seconds (frame + 0.0215);
-		content->_audio_stream->first_audio = ContentTime ();
-		FFmpegDecoder decoder (content, film->log());
+		content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
+		FFmpegDecoder decoder (content, film->log(), false);
 		BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215), 0.00001);
 	}
 
@@ -74,8 +79,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		/* Video is off a frame boundary and both have a common offset */
 		double const frame = 1.0 / 24.0;
 		content->_first_video = ContentTime::from_seconds (frame + 0.0215 + 4.1);
-		content->_audio_stream->first_audio = ContentTime::from_seconds (4.1);
-		FFmpegDecoder decoder (content, film->log());
+		content->ffmpeg_audio_streams().front()->first_audio = ContentTime::from_seconds (4.1);
+		FFmpegDecoder decoder (content, film->log(), false);
 		BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1, 0.1);
 	}
 }