Plot video and subtitle on one track and audio on the rest in the timeline.

[dcpomatic.git] / test / ffmpeg_decoder_sequential_test.cc

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 5511576521f59ce7fc5557ef55015c2f66d2e051..03bf9e2ce3adfe0de8e4de5df599e05e402577ce 100644 (file)
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -22,13 +22,14 @@
  *  (dropped frames being checked by assert() in VideoDecoder).  Also that the decoder picks up frame rates correctly.
  */
 
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
 #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 <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+#include <iostream>
 
 using std::cout;
 using std::cerr;
@@ -37,7 +38,7 @@ using boost::shared_ptr;
 using boost::optional;
 
 static void
-test (boost::filesystem::path file, float fps, int gaps)
+test (boost::filesystem::path file, float fps, int gaps, int video_length)
 {
        boost::filesystem::path path = private_data / file;
        if (!boost::filesystem::exists (path)) {
@@ -46,36 +47,34 @@ test (boost::filesystem::path file, float fps, int gaps)
        }
 
        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);
-       FFmpegDecoder decoder (content, log);
+       shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false));
 
-       BOOST_CHECK_CLOSE (decoder.video_content()->video_frame_rate(), fps, 0.01);
-       
-       Frame const N = decoder.video_content()->video_length().frames (decoder.video_content()->video_frame_rate ());
-#ifdef DCPOMATIC_DEBUG 
-       decoder.test_gaps = 0;
-#endif 
-       for (Frame i = 0; i < N; ++i) {
+       BOOST_CHECK_CLOSE (decoder->video_content()->video_frame_rate(), fps, 0.01);
+
+#ifdef DCPOMATIC_DEBUG
+       decoder->test_gaps = 0;
+#endif
+       for (Frame i = 0; i < video_length; ++i) {
                list<ContentVideo> v;
-               v = decoder.get_video (i, true);
-               BOOST_CHECK_EQUAL (v.size(), 1);
+               v = decoder->get_video (i, true);
+               BOOST_REQUIRE_EQUAL (v.size(), 1U);
                BOOST_CHECK_EQUAL (v.front().frame, i);
        }
-#ifdef DCPOMATIC_DEBUG 
-       BOOST_CHECK_EQUAL (decoder.test_gaps, gaps);
+#ifdef DCPOMATIC_DEBUG
+       BOOST_CHECK_EQUAL (decoder->test_gaps, gaps);
 #endif
 }
 
 BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
 {
-       test ("boon_telly.mkv", 29.97, 0);
-       test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 0);
+       test ("boon_telly.mkv", 29.97, 0, 6910);
+       test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 0, 1248);
        /* The first video frame is 12 here, so VideoDecoder should see 12 gaps
           (at the start of the file)
        */
-       test ("prophet_clip.mkv", 23.976, 12);
+       test ("prophet_clip.mkv", 23.976, 12, 2875);
 }
-