summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-09-09 09:50:48 +0100
committerCarl Hetherington <cth@carlh.net>2015-09-09 09:50:48 +0100
commitf26af8112b03b5233eb5239defd11a7428b705ad (patch)
treea7385c484829f531bbbc35b3f38235035e160a92 /test
parent272ce54d159a53be22f592922913901cfc673097 (diff)
Use SRC_LINEAR for speed when analysing audio (#685).
Diffstat (limited to 'test')
-rw-r--r--test/audio_decoder_test.cc2
-rw-r--r--test/dcp_subtitle_test.cc2
-rw-r--r--test/ffmpeg_decoder_seek_test.cc2
-rw-r--r--test/ffmpeg_decoder_sequential_test.cc2
-rw-r--r--test/ffmpeg_pts_offset_test.cc10
-rw-r--r--test/resampler_test.cc2
-rw-r--r--test/seek_zero_test.cc2
7 files changed, 11 insertions, 11 deletions
diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc
index 00d555d86..e63e1a5b0 100644
--- a/test/audio_decoder_test.cc
+++ b/test/audio_decoder_test.cc
@@ -59,7 +59,7 @@ class TestAudioDecoder : public AudioDecoder
{
public:
TestAudioDecoder (shared_ptr<TestAudioContent> content)
- : AudioDecoder (content)
+ : AudioDecoder (content, false)
, _test_audio_content (content)
, _position (0)
{}
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 9007ad611..1defe9d01 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -66,7 +66,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));
+ shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, false));
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 39536f1ab..2a9b4da71 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -63,7 +63,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));
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 ce799bb24..22ab61624 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -50,7 +50,7 @@ test (boost::filesystem::path file, float fps, int gaps)
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));
BOOST_CHECK_CLOSE (decoder->video_content()->video_frame_rate(), fps, 0.01);
diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index 0ded56431..65ed6436d 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
/* Sound == video so no offset required */
content->_first_video = ContentTime ();
content->_audio_streams.front()->first_audio = ContentTime ();
- FFmpegDecoder decoder (content, film->log());
+ FFmpegDecoder decoder (content, film->log(), false);
BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ());
}
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
/* Common offset should be removed */
content->_first_video = ContentTime::from_seconds (600);
content->_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, ContentTime::from_seconds (-600));
}
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
/* Video is on a frame boundary */
content->_first_video = ContentTime::from_frames (1, 24);
content->_audio_streams.front()->first_audio = ContentTime ();
- FFmpegDecoder decoder (content, film->log());
+ FFmpegDecoder decoder (content, film->log(), false);
BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ());
}
@@ -66,7 +66,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->_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);
}
@@ -75,7 +75,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->_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);
}
}
diff --git a/test/resampler_test.cc b/test/resampler_test.cc
index d633f75c1..f536d6547 100644
--- a/test/resampler_test.cc
+++ b/test/resampler_test.cc
@@ -33,7 +33,7 @@ using boost::shared_ptr;
static void
resampler_test_one (int from, int to)
{
- Resampler resamp (from, to, 1);
+ Resampler resamp (from, to, 1, false);
/* 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 5f870ba41..ab2b48198 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
Frame const first_frame = video_delay.round_up (content->video_frame_rate ()).frames_round (content->video_frame_rate ());
- FFmpegDecoder decoder (content, film->log());
+ FFmpegDecoder decoder (content, film->log(), false);
list<ContentVideo> a = decoder.get_video (first_frame, true);
BOOST_CHECK (a.size() == 1);
BOOST_CHECK_EQUAL (a.front().frame, first_frame);