summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-08-30 00:57:08 +0100
committerCarl Hetherington <cth@carlh.net>2017-08-30 00:57:08 +0100
commitd81db4280dd09ea9d0064272b075667d659b594a (patch)
tree247642b0f830d3fefcd306dff58970143b9c51e1 /test
parentd12cf77f25e6e39fbfd4b249690149309a21646e (diff)
Rename test file.
Diffstat (limited to 'test')
-rw-r--r--test/ffmpeg_decoder_seek_test.cc5
-rw-r--r--test/ffmpeg_decoder_sequential_test.cc2
-rw-r--r--test/interrupt_encoder_test.cc2
-rw-r--r--test/video_content_scale_test.cc2
4 files changed, 6 insertions, 5 deletions
diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index 26fab5f3d..87ac5040f 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -46,10 +46,11 @@ using boost::shared_ptr;
using boost::optional;
static optional<ContentVideo> stored;
-static void
+static bool
store (ContentVideo v)
{
stored = v;
+ return true;
}
static void
@@ -100,5 +101,5 @@ BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
frames.push_back (999);
frames.push_back (15);
- test ("prophet_clip.mkv", frames);
+ test ("prophet_long_clip.mkv", frames);
}
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 67a825418..81dd07784 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -83,5 +83,5 @@ BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
{
ffmpeg_decoder_sequential_test_one ("boon_telly.mkv", 29.97, 6912);
ffmpeg_decoder_sequential_test_one ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 1253);
- ffmpeg_decoder_sequential_test_one ("prophet_clip.mkv", 23.976, 2879);
+ ffmpeg_decoder_sequential_test_one ("prophet_long_clip.mkv", 23.976, 2879);
}
diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc
index 1068ed5b2..3b5717f16 100644
--- a/test/interrupt_encoder_test.cc
+++ b/test/interrupt_encoder_test.cc
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (interrupt_encoder_test)
film->set_container (Ratio::from_id ("185"));
film->set_name ("interrupt_encoder_test");
- shared_ptr<FFmpegContent> content (new FFmpegContent (film, private_data / "prophet_clip.mkv"));
+ shared_ptr<FFmpegContent> content (new FFmpegContent (film, private_data / "prophet_long_clip.mkv"));
film->examine_and_add_content (content);
wait_for_jobs ();
diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc
index 202243dd8..35812df35 100644
--- a/test/video_content_scale_test.cc
+++ b/test/video_content_scale_test.cc
@@ -44,7 +44,7 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop
string s = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<Content>"
"<Type>FFmpeg</Type>"
- "<Path>/home/c.hetherington/DCP/prophet_clip.mkv</Path>"
+ "<Path>/home/c.hetherington/DCP/prophet_long_clip.mkv</Path>"
"<Digest>f3f23663da5bef6d2cbaa0db066f3351314142710</Digest>"
"<Position>0</Position>"
"<TrimStart>0</TrimStart>"