Fix errors when seeking FFmpeg for some formats.

[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 0e5b2963f89d60e6a004654413fb1acc8b87f546..4dceae86ba6f6416e7add63be7c0093265fad6e8 100644 (file)
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,79 +18,87 @@
 
 */
 
+
 /** @file  test/ffmpeg_decoder_seek_test.cc
- *  @brief Check that get_video() returns the frame indexes that we ask for
- *  for FFmpegDecoder.
+ *  @brief Check seek() with FFmpegDecoder.
+ *  @ingroup selfcontained
  *
  *  This doesn't check that the contents of those frames are right, which
  *  it probably should.
  */
 
+
+#include "lib/content_video.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
-#include "lib/null_log.h"
 #include "lib/film.h"
-#include "lib/content_video.h"
+#include "lib/null_log.h"
 #include "lib/video_decoder.h"
 #include "test.h"
-#include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+#include <iostream>
 #include <vector>
 
+
 using std::cerr;
-using std::vector;
+using std::cout;
 using std::list;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
+using std::vector;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
+
+
+static optional<ContentVideo> stored;
+static bool
+store (ContentVideo v)
+{
+       stored = v;
+       return true;
+}
+
 
 static void
 check (shared_ptr<FFmpegDecoder> decoder, int frame)
 {
-       list<ContentVideo> v;
-       v = decoder->video->get (frame, true);
-       BOOST_CHECK (v.size() == 1);
-       BOOST_CHECK_EQUAL (v.front().frame.index(), frame);
+       BOOST_REQUIRE (decoder->ffmpeg_content()->video_frame_rate ());
+       decoder->seek (ContentTime::from_frames (frame, decoder->ffmpeg_content()->video_frame_rate().get()), true);
+       stored = optional<ContentVideo> ();
+       while (!decoder->pass() && !stored) {}
+       BOOST_CHECK (stored->frame <= frame);
 }
 
+
 static void
 test (boost::filesystem::path file, vector<int> frames)
 {
-       boost::filesystem::path path = private_data / file;
-       if (!boost::filesystem::exists (path)) {
-               cerr << "Skipping test: " << path.string() << " not found.\n";
-               return;
-       }
+       auto path = TestPaths::private_data() / file;
+       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));
+       auto film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
+       auto content = make_shared<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());
+       auto decoder = make_shared<FFmpegDecoder>(film, content, false);
+       decoder->video->Data.connect (bind (&store, _1));
 
-       for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
-               check (decoder, *i);
+       for (auto i: frames) {
+               check (decoder, i);
        }
 }
 
+
 BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
 {
-       vector<int> frames;
-
-       frames.clear ();
-       frames.push_back (0);
-       frames.push_back (42);
-       frames.push_back (999);
-       frames.push_back (0);
+       vector<int> frames = { 0, 42, 999, 0 };
 
        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);
-
-       test ("prophet_clip.mkv", frames);
+       test ("prophet_long_clip.mkv", { 15, 42, 999, 15 });
+       test ("dolby_aurora.vob", { 0, 125, 250, 41 });
 }