Merge master.

2 files changed, 147 insertions, 5 deletions

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index a459e6c71..8e4fb0e18 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -31,6 +31,9 @@
 #include "lib/image.h"
 #include "lib/cross.h"
 #include "lib/dcp_video_frame.h"
+#include "lib/scaler.h"
+#include "lib/player_video_frame.h"
+#include "lib/image_proxy.h"
 
 using std::list;
 using boost::shared_ptr;
@@ -75,17 +78,27 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 		p += sub_image->stride()[0];
 	}
 
-	/* XXX */
-//	shared_ptr<Subtitle> subtitle (new Subtitle (Position<int> (50, 60), sub_image));
+	shared_ptr<PlayerVideoFrame> pvf (
+		new PlayerVideoFrame (
+			shared_ptr<ImageProxy> (new RawImageProxy (image)),
+			Crop (),
+			dcp::Size (1998, 1080),
+			dcp::Size (1998, 1080),
+			Scaler::from_id ("bicubic"),
+			EYES_BOTH,
+			PART_WHOLE,
+			ColourConversion ()
+			)
+		);
+
+	pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
 
 	shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
 
 	shared_ptr<DCPVideoFrame> frame (
 		new DCPVideoFrame (
-			image,
+			pvf,
 			0,
-			EYES_BOTH,
-			ColourConversion (),
 			24,
 			200000000,
 			RESOLUTION_2K,
diff --git a/test/play_test.cc b/test/play_test.cc
new file mode 100644
index 000000000..1ba2e7d88
--- /dev/null
+++ b/test/play_test.cc
@@ -0,0 +1,129 @@
+/*
+    Copyright (C) 2013-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 "lib/player.h"
+#include "lib/ratio.h"
+#include "lib/dcp_content_type.h"
+#include "lib/player_video_frame.h"
+#include "test.h"
+
+/* This test needs stuff in Player that is only included in debug mode */
+#ifdef DCPOMATIC_DEBUG
+
+using std::cout;
+using boost::optional;
+using boost::shared_ptr;
+
+struct Video
+{
+	boost::shared_ptr<Content> content;
+	boost::shared_ptr<const Image> image;
+	Time time;
+};
+
+class PlayerWrapper
+{
+public:
+	PlayerWrapper (shared_ptr<Player> p)
+		: _player (p)
+	{
+		_player->Video.connect (bind (&PlayerWrapper::process_video, this, _1, _3));
+	}
+
+	void process_video (shared_ptr<PlayerVideoFrame> i, Time t)
+	{
+		Video v;
+		v.content = _player->_last_video;
+		v.image = i->image ();
+		v.time = t;
+		_queue.push_front (v);
+	}
+
+	optional<Video> get_video ()
+	{
+		while (_queue.empty() && !_player->pass ()) {}
+		if (_queue.empty ()) {
+			return optional<Video> ();
+		}
+		
+		Video v = _queue.back ();
+		_queue.pop_back ();
+		return v;
+	}
+
+	void seek (Time t, bool ac)
+	{
+		_player->seek (t, ac);
+		_queue.clear ();
+	}
+
+private:
+	shared_ptr<Player> _player;
+	std::list<Video> _queue;
+};
+
+BOOST_AUTO_TEST_CASE (play_test)
+{
+	shared_ptr<Film> film = new_test_film ("play_test");
+	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_container (Ratio::from_id ("185"));
+	film->set_name ("play_test");
+
+	shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/red_24.mp4"));
+	film->examine_and_add_content (A);
+	wait_for_jobs ();
+
+	BOOST_CHECK_EQUAL (A->video_length_after_3d_combine(), 16);
+
+	shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/red_30.mp4"));
+	film->examine_and_add_content (B);
+	wait_for_jobs ();
+
+	BOOST_CHECK_EQUAL (B->video_length_after_3d_combine(), 16);
+	
+	/* Film should have been set to 25fps */
+	BOOST_CHECK_EQUAL (film->video_frame_rate(), 25);
+
+	BOOST_CHECK_EQUAL (A->position(), 0);
+	/* A is 16 frames long at 25 fps */
+	BOOST_CHECK_EQUAL (B->position(), 16 * TIME_HZ / 25);
+
+	shared_ptr<Player> player = film->make_player ();
+	PlayerWrapper wrap (player);
+	/* Seek and audio don't get on at the moment */
+	player->disable_audio ();
+
+	for (int i = 0; i < 32; ++i) {
+		optional<Video> v = wrap.get_video ();
+		BOOST_CHECK (v);
+		if (i < 16) {
+			BOOST_CHECK (v.get().content == A);
+		} else {
+			BOOST_CHECK (v.get().content == B);
+		}
+	}
+
+	player->seek (10 * TIME_HZ / 25, true);
+	optional<Video> v = wrap.get_video ();
+	BOOST_CHECK (v);
+	BOOST_CHECK_EQUAL (v.get().time, 10 * TIME_HZ / 25);
+}
+
+#endif