Add and use dB/linear conversion functions.

[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 26fab5f3d95c702a9d24cb55605f1eba1481005f..3e825e4433383f455469ae2a52d3011fba47042a 100644 (file)
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -44,12 +44,14 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 static optional<ContentVideo> stored;
-static void
+static bool
 store (ContentVideo v)
 {
        stored = v;
+       return true;
 }
 
 static void
@@ -69,11 +71,10 @@ test (boost::filesystem::path file, vector<int> frames)
        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);
-       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) {
@@ -100,5 +101,5 @@ BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
        frames.push_back (999);
        frames.push_back (15);
 
-       test ("prophet_clip.mkv", frames);
+       test ("prophet_long_clip.mkv", frames);
 }