projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing library from test link list.
[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 f99229c65d27962c864e0db8a712f008ab4122b0..d761d946556291db329d92d297cee36edc80b206 100644
(file)
--- a/
test/ffmpeg_decoder_sequential_test.cc
+++ b/
test/ffmpeg_decoder_sequential_test.cc
@@
-26,7
+26,6
@@
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_decoder.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_decoder.h"
-#include "lib/null_log.h"
#include "lib/content_video.h"
#include "lib/video_decoder.h"
#include "lib/film.h"
#include "lib/content_video.h"
#include "lib/video_decoder.h"
#include "lib/film.h"
@@
-58,7
+57,7
@@
check (shared_ptr<PlayerVideo>, DCPTime time)
void
ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int video_length)
{
void
ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int video_length)
{
- boost::filesystem::path path = private_data / file;
+ boost::filesystem::path path =
TestPaths::
private_data / file;
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());
@@
-66,8
+65,7
@@
ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
film->write_metadata ();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
film->write_metadata ();
- shared_ptr<Log> log (new NullLog);
- shared_ptr<Player> player (new Player (film, film->playlist()));
+ shared_ptr<Player> player (new Player(film));
BOOST_REQUIRE (content->video_frame_rate());
BOOST_CHECK_CLOSE (content->video_frame_rate().get(), fps, 0.01);
BOOST_REQUIRE (content->video_frame_rate());
BOOST_CHECK_CLOSE (content->video_frame_rate().get(), fps, 0.01);