diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-22 01:47:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-22 01:47:28 +0100 |
| commit | 76f83b97c401c24b3c93baee0665e84be05f43ea (patch) | |
| tree | 75e7f3e87f3721c8ac4c55ac6bc9559556954987 /test | |
| parent | 5e9e59e044fe3b51352d5dccad7f11882c6a571c (diff) | |
Set AudioDecoder::fast a different way.
Diffstat (limited to 'test')
| -rw-r--r-- | test/audio_decoder_test.cc | 2 | ||||
| -rw-r--r-- | test/dcp_subtitle_test.cc | 2 | ||||
| -rw-r--r-- | test/ffmpeg_decoder_seek_test.cc | 2 | ||||
| -rw-r--r-- | test/ffmpeg_decoder_sequential_test.cc | 2 | ||||
| -rw-r--r-- | test/ffmpeg_pts_offset_test.cc | 10 | ||||
| -rw-r--r-- | test/resampler_test.cc | 2 | ||||
| -rw-r--r-- | test/seek_zero_test.cc | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc index 945773d12..b71fd22c8 100644 --- a/test/audio_decoder_test.cc +++ b/test/audio_decoder_test.cc @@ -66,7 +66,7 @@ public: : _test_audio_content (content) , _position (0) { - audio.reset (new AudioDecoder (this, content->audio, false, log)); + audio.reset (new AudioDecoder (this, content->audio, log)); } bool pass (PassReason, bool) diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index ef733d370..d45ac603e 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -71,7 +71,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(), false)); + shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log())); list<ContentTimePeriod> ctp = decoder->text_subtitles_during ( ContentTimePeriod ( diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc index 8a854b01b..0e5b2963f 100644 --- a/test/ffmpeg_decoder_seek_test.cc +++ b/test/ffmpeg_decoder_seek_test.cc @@ -66,7 +66,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, false)); + shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log)); for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) { check (decoder, *i); diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc index 6a27d698f..6fa945f84 100644 --- a/test/ffmpeg_decoder_sequential_test.cc +++ b/test/ffmpeg_decoder_sequential_test.cc @@ -54,7 +54,7 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int film->examine_and_add_content (content); wait_for_jobs (); shared_ptr<Log> log (new NullLog); - shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false)); + shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log)); BOOST_REQUIRE (decoder->video->_content->video_frame_rate()); BOOST_CHECK_CLOSE (decoder->video->_content->video_frame_rate().get(), fps, 0.01); diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc index 02ea0233d..05c4e15c8 100644 --- a/test/ffmpeg_pts_offset_test.cc +++ b/test/ffmpeg_pts_offset_test.cc @@ -47,7 +47,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 (content, film->log()); BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ()); } @@ -55,7 +55,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 (content, film->log()); BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime::from_seconds (-600)); } @@ -63,7 +63,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 (content, film->log()); BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ()); } @@ -72,7 +72,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 (content, film->log()); BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215), 0.00001); } @@ -81,7 +81,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 (content, film->log()); BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1, 0.1); } } diff --git a/test/resampler_test.cc b/test/resampler_test.cc index fb4b98861..6f102dd4c 100644 --- a/test/resampler_test.cc +++ b/test/resampler_test.cc @@ -35,7 +35,7 @@ using boost::shared_ptr; static void resampler_test_one (int from, int to) { - Resampler resamp (from, to, 1, false); + Resampler resamp (from, to, 1); /* 3 hours */ int64_t const N = int64_t (from) * 60 * 60 * 3; diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc index 05bf1b5bf..a176339e7 100644 --- a/test/seek_zero_test.cc +++ b/test/seek_zero_test.cc @@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE (seek_zero_test) Frame const first_frame = video_delay.round_up (content->active_video_frame_rate ()).frames_round (content->active_video_frame_rate ()); - FFmpegDecoder decoder (content, film->log(), false); + FFmpegDecoder decoder (content, film->log()); list<ContentVideo> a = decoder.video->get (first_frame, true); BOOST_CHECK (a.size() == 1); BOOST_CHECK_EQUAL (a.front().frame.index(), first_frame); |
