Rename test file.
authorCarl Hetherington <cth@carlh.net>
Tue, 29 Aug 2017 23:57:08 +0000 (00:57 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 29 Aug 2017 23:57:08 +0000 (00:57 +0100)
test/ffmpeg_decoder_seek_test.cc
test/ffmpeg_decoder_sequential_test.cc
test/interrupt_encoder_test.cc
test/video_content_scale_test.cc

index 26fab5f3d95c702a9d24cb55605f1eba1481005f..87ac5040fffa642ec259fee463235434ec134765 100644 (file)
@@ -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);
 }
index 67a82541894923e5010ff44e78ec0b441ce14fb7..81dd07784d958bfc7b1fed762e3379e93ff73822 100644 (file)
@@ -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);
 }
index 1068ed5b2089882b4f6e5b23521f9ae7edfbc72f..3b5717f165acab4eebe56e19d394558007083c39 100644 (file)
@@ -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 ();
 
index 202243dd8bdab4a50c94e0afdafaa568c3829882..35812df35cb5ba2a72aab167f7549076c6c1a33a 100644 (file)
@@ -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>"