diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-09-03 22:41:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-09-03 22:41:40 +0100 |
| commit | 4b2cf0764a4091b9466f90e6dbbeb029e04bc2be (patch) | |
| tree | df2833faa1f301b0a8a05a08d68dd922cac51d51 /test | |
| parent | 257f36fea6aed378c3060c1789294b68b317a456 (diff) | |
Restore correct setup of fast resampler when the player is set to fast.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dcp_subtitle_test.cc | 2 | ||||
| -rw-r--r-- | test/ffmpeg_decoder_seek_test.cc | 2 | ||||
| -rw-r--r-- | test/ffmpeg_pts_offset_test.cc | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 927b8be69..b4dfe1df7 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) film->examine_and_add_content (content); wait_for_jobs (); - shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log())); + shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log(), false)); decoder->subtitle->TextStart.connect (bind (store, _1)); stored = optional<ContentTextSubtitle> (); diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc index 87ac5040f..c09fd02f3 100644 --- a/test/ffmpeg_decoder_seek_test.cc +++ b/test/ffmpeg_decoder_seek_test.cc @@ -74,7 +74,7 @@ test (boost::filesystem::path file, vector<int> frames) film->examine_and_add_content (content); wait_for_jobs (); shared_ptr<Log> log (new NullLog); - shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log)); + shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false)); decoder->video->Data.connect (bind (&store, _1)); for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) { diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc index 85a1e7844..bdc46f6d9 100644 --- a/test/ffmpeg_pts_offset_test.cc +++ b/test/ffmpeg_pts_offset_test.cc @@ -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()); + FFmpegDecoder decoder (content, film->log(), 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()); + FFmpegDecoder decoder (content, film->log(), 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()); + FFmpegDecoder decoder (content, film->log(), 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()); + FFmpegDecoder decoder (content, film->log(), 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()); + FFmpegDecoder decoder (content, film->log(), false); BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1, 0.1); } } |
