projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove specification of italic/bold fonts (#1451); synthesis will be used instead.
[dcpomatic.git]
/
test
/
ffmpeg_decoder_sequential_test.cc
diff --git
a/test/ffmpeg_decoder_sequential_test.cc
b/test/ffmpeg_decoder_sequential_test.cc
index 6bda8f2601084bdcecb987a098e2d9c5ba80f954..892bc9e4c0909978f4c47be157cda4867badadde 100644
(file)
--- a/
test/ffmpeg_decoder_sequential_test.cc
+++ b/
test/ffmpeg_decoder_sequential_test.cc
@@
-50,7
+50,7
@@
static DCPTime frame;
static void
check (shared_ptr<PlayerVideo>, DCPTime time)
{
static void
check (shared_ptr<PlayerVideo>, DCPTime time)
{
- BOOST_
CHECK
(time == next);
+ BOOST_
REQUIRE
(time == next);
next += frame;
}
next += frame;
}
@@
-61,9
+61,9
@@
ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
BOOST_REQUIRE (boost::filesystem::exists (path));
shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_sequential_test_" + file.string());
BOOST_REQUIRE (boost::filesystem::exists (path));
shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_sequential_test_" + file.string());
- shared_ptr<FFmpegContent> content (new FFmpegContent
(film,
path));
+ shared_ptr<FFmpegContent> content (new FFmpegContent
(
path));
film->examine_and_add_content (content);
film->examine_and_add_content (content);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
film->write_metadata ();
shared_ptr<Log> log (new NullLog);
shared_ptr<Player> player (new Player (film, film->playlist()));
film->write_metadata ();
shared_ptr<Log> log (new NullLog);
shared_ptr<Player> player (new Player (film, film->playlist()));
@@
-76,12
+76,12
@@
ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
next = DCPTime ();
frame = DCPTime::from_frames (1, film->video_frame_rate ());
while (!player->pass()) {}
next = DCPTime ();
frame = DCPTime::from_frames (1, film->video_frame_rate ());
while (!player->pass()) {}
- BOOST_
CHECK
(next == DCPTime::from_frames (video_length, film->video_frame_rate()));
+ BOOST_
REQUIRE
(next == DCPTime::from_frames (video_length, film->video_frame_rate()));
}
BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
{
}
BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
{
- ffmpeg_decoder_sequential_test_one ("boon_telly.mkv", 29.97, 691
1
);
+ ffmpeg_decoder_sequential_test_one ("boon_telly.mkv", 29.97, 691
2
);
ffmpeg_decoder_sequential_test_one ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 1253);
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);
}
}