projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split audio; builds.
[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 968c3bdf910eb0265441739ae4b07a7783cfb172..2a9b4da715ed35ef2cab298f8b654a2759911157 100644
(file)
--- a/
test/ffmpeg_decoder_seek_test.cc
+++ b/
test/ffmpeg_decoder_seek_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2015
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-25,14
+25,14
@@
* it probably should.
*/
* it probably should.
*/
-#include <vector>
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_decoder.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_decoder.h"
-#include "lib/log.h"
+#include "lib/
null_
log.h"
#include "lib/film.h"
#include "test.h"
#include "lib/film.h"
#include "test.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
using std::cerr;
using std::vector;
using std::cerr;
using std::vector;
@@
-41,10
+41,10
@@
using boost::shared_ptr;
using boost::optional;
static void
using boost::optional;
static void
-check (
FFmpegDecoder&
decoder, int frame)
+check (
shared_ptr<FFmpegDecoder>
decoder, int frame)
{
list<ContentVideo> v;
{
list<ContentVideo> v;
- v = decoder
.
get_video (frame, true);
+ v = decoder
->
get_video (frame, true);
BOOST_CHECK (v.size() == 1);
BOOST_CHECK_EQUAL (v.front().frame, frame);
}
BOOST_CHECK (v.size() == 1);
BOOST_CHECK_EQUAL (v.front().frame, frame);
}
@@
-59,11
+59,11
@@
test (boost::filesystem::path file, vector<int> frames)
}
shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
}
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 (film, path));
film->examine_and_add_content (content);
wait_for_jobs ();
shared_ptr<Log> log (new NullLog);
film->examine_and_add_content (content);
wait_for_jobs ();
shared_ptr<Log> log (new NullLog);
-
FFmpegDecoder decoder (content, log
);
+
shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false)
);
for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
check (decoder, *i);
for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
check (decoder, *i);
@@
-73,7
+73,7
@@
test (boost::filesystem::path file, vector<int> frames)
BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
{
vector<int> frames;
BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
{
vector<int> frames;
-
+
frames.clear ();
frames.push_back (0);
frames.push_back (42);
frames.clear ();
frames.push_back (0);
frames.push_back (42);
@@
-82,13
+82,12
@@
BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
test ("boon_telly.mkv", frames);
test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", frames);
test ("boon_telly.mkv", frames);
test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", frames);
-
+
frames.clear ();
frames.push_back (15);
frames.push_back (42);
frames.push_back (999);
frames.push_back (15);
frames.clear ();
frames.push_back (15);
frames.push_back (42);
frames.push_back (999);
frames.push_back (15);
-
+
test ("prophet_clip.mkv", frames);
}
test ("prophet_clip.mkv", frames);
}
-