projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak crop icon for GTK2 builds (#1997).
[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 46d82b0229679a297fc281829c421f59d412cf00..01eec011010177db24d44225a1aca4444d29dc6f 100644
(file)
--- a/
test/ffmpeg_decoder_seek_test.cc
+++ b/
test/ffmpeg_decoder_seek_test.cc
@@
-20,6
+20,7
@@
/** @file test/ffmpeg_decoder_seek_test.cc
* @brief Check seek() with FFmpegDecoder.
/** @file test/ffmpeg_decoder_seek_test.cc
* @brief Check seek() with FFmpegDecoder.
+ * @ingroup selfcontained
*
* This doesn't check that the contents of those frames are right, which
* it probably should.
*
* This doesn't check that the contents of those frames are right, which
* it probably should.
@@
-41,14
+42,19
@@
using std::cerr;
using std::vector;
using std::list;
using std::cout;
using std::vector;
using std::list;
using std::cout;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
static optional<ContentVideo> stored;
static optional<ContentVideo> stored;
-static
void
+static
bool
store (ContentVideo v)
{
stored = v;
store (ContentVideo v)
{
stored = v;
+ return true;
}
static void
}
static void
@@
-64,15
+70,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) {
@@
-99,5
+104,5
@@
BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
frames.push_back (999);
frames.push_back (15);
frames.push_back (999);
frames.push_back (15);
- test ("prophet_clip.mkv", frames);
+ test ("prophet_
long_
clip.mkv", frames);
}
}