projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Round the length of video-containing content to the nearest frame.
[dcpomatic.git]
/
test
/
ffmpeg_decoder_seek_test.cc
diff --git
a/test/ffmpeg_decoder_seek_test.cc
b/test/ffmpeg_decoder_seek_test.cc
index 87ac5040fffa642ec259fee463235434ec134765..8adcbf8b8c901c061d982b9e8b8ebb9017d84855 100644
(file)
--- a/
test/ffmpeg_decoder_seek_test.cc
+++ b/
test/ffmpeg_decoder_seek_test.cc
@@
-44,6
+44,7
@@
using std::list;
using std::cout;
using boost::shared_ptr;
using boost::optional;
using std::cout;
using boost::shared_ptr;
using boost::optional;
+using namespace dcpomatic;
static optional<ContentVideo> stored;
static bool
static optional<ContentVideo> stored;
static bool
@@
-66,15
+67,14
@@
check (shared_ptr<FFmpegDecoder> decoder, int frame)
static void
test (boost::filesystem::path file, vector<int> frames)
{
static void
test (boost::filesystem::path file, vector<int> frames)
{
- 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_seek_test_" + file.string());
BOOST_REQUIRE (boost::filesystem::exists (path));
shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_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 ();
- shared_ptr<Log> log (new NullLog);
- shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log));
+ BOOST_REQUIRE (!wait_for_jobs());
+ shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, content, false));
decoder->video->Data.connect (bind (&store, _1));
for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
decoder->video->Data.connect (bind (&store, _1));
for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {