Various fixes to FFmpeg decoder, including a couple of tests.

6 files changed, 171 insertions, 1 deletions

diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
new file mode 100644
index 000000000..76124786e
--- /dev/null
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -0,0 +1,85 @@
+/*
+    Copyright (C) 2014 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <vector>
+#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/film.h"
+#include "test.h"
+
+using std::cerr;
+using std::vector;
+using boost::shared_ptr;
+using boost::optional;
+
+static void
+check (FFmpegDecoder& decoder, int frame)
+{
+	optional<ContentVideo> v;
+	v = decoder.get_video (frame, true);
+	BOOST_CHECK (v);
+	BOOST_CHECK_EQUAL (v->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;
+	}
+
+	shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
+	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);
+
+	for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
+		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);
+
+	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);
+}
+
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
new file mode 100644
index 000000000..96de9be27
--- /dev/null
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -0,0 +1,76 @@
+/*
+    Copyright (C) 2014 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#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/film.h"
+#include "test.h"
+
+using std::cout;
+using std::cerr;
+using boost::shared_ptr;
+using boost::optional;
+
+/** @param black Frame index of first frame in the video */ 
+static void
+test (boost::filesystem::path file, float fps, int first)
+{
+	boost::filesystem::path path = private_data / file;
+	if (!boost::filesystem::exists (path)) {
+		cerr << "Skipping test: " << path.string() << " not found.\n";
+		return;
+	}
+
+	shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
+	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);
+
+	BOOST_CHECK_CLOSE (decoder.video_content()->video_frame_rate(), fps, 0.01);
+	
+	VideoFrame const N = decoder.video_content()->video_length().frames (decoder.video_content()->video_frame_rate ());
+	decoder.test_gaps = 0;
+	for (VideoFrame i = 0; i < N; ++i) {
+		optional<ContentVideo> v;
+		v = decoder.get_video (i, true);
+		if (i < first) {
+			BOOST_CHECK (!v);
+		} else {
+			BOOST_CHECK (v);
+			BOOST_CHECK_EQUAL (v->frame, i);
+		}
+	}
+	BOOST_CHECK_EQUAL (decoder.test_gaps, 0);
+}
+
+/** Check that the FFmpeg decoder produces sequential frames without gaps or dropped frames;
+ *  (dropped frames being checked by assert() in VideoDecoder).  Also that the decoder picks up frame rates correctly.
+ */
+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 ("prophet_clip.mkv", 23.976, 12);
+}
+
diff --git a/test/test.cc b/test/test.cc
index 241032099..f393e80c3 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -43,6 +43,8 @@ using std::cerr;
 using std::list;
 using boost::shared_ptr;
 
+boost::filesystem::path private_data = boost::filesystem::path ("test") / boost::filesystem::path ("private");
+
 class TestUISignaller : public UISignaller
 {
 public:
diff --git a/test/test.h b/test/test.h
index a42b41577..57ea32c57 100644
--- a/test/test.h
+++ b/test/test.h
@@ -22,6 +22,8 @@
 class Film;
 class Image;
 
+extern boost::filesystem::path private_data;
+
 extern void wait_for_jobs ();
 extern boost::shared_ptr<Film> new_test_film (std::string);
 extern void check_dcp (boost::filesystem::path, boost::filesystem::path);
diff --git a/test/util_test.cc b/test/util_test.cc
index 25b814004..b2085afe1 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -66,6 +66,9 @@ BOOST_AUTO_TEST_CASE (dcptime_round_up_test)
 	BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 42), DCPTime (42));
 	BOOST_CHECK_EQUAL (DCPTime (42).round_up (DCPTime::HZ / 42), DCPTime (42));
 	BOOST_CHECK_EQUAL (DCPTime (43).round_up (DCPTime::HZ / 42), DCPTime (84));
+
+	/* Check that rounding up to non-integer frame rates works */
+	BOOST_CHECK_EQUAL (DCPTime (45312).round_up (29.976), DCPTime (48045));
 }
 
 
diff --git a/test/wscript b/test/wscript
index ba5aabb7c..2fbe74150 100644
--- a/test/wscript
+++ b/test/wscript
@@ -24,6 +24,8 @@ def build(bld):
                  colour_conversion_test.cc
                  ffmpeg_audio_test.cc
                  ffmpeg_dcp_test.cc
+                 ffmpeg_decoder_seek_test.cc
+                 ffmpeg_decoder_sequential_test.cc
                  ffmpeg_examiner_test.cc
                  ffmpeg_pts_offset.cc
                  file_group_test.cc