X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=6ca0073d81ed39c037d6404977e578a5593a1d55;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hp=d480602422b0ee1a810cfc74a1e38c0ad575eb1b;hpb=73f52e94953848c696725defd3d7f5c4c30707e2;p=dcpomatic.git

diff --git a/test/player_test.cc b/test/player_test.cc
index d48060242..6ca0073d8 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,8 +22,6 @@
  *  @brief Various tests of Player.
  */
 
-#include <iostream>
-#include <boost/test/unit_test.hpp>
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/dcp_content_type.h"
@@ -30,51 +29,63 @@
 #include "lib/audio_buffers.h"
 #include "lib/player.h"
 #include "test.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/make_shared.hpp>
+#include <iostream>
 
 using std::cout;
 using std::list;
 using boost::shared_ptr;
+using boost::make_shared;
+
+static bool
+valid (Content const *)
+{
+	return true;
+}
 
 /** Player::overlaps */
 BOOST_AUTO_TEST_CASE (player_overlaps_test)
 {
 	shared_ptr<Film> film = new_test_film ("player_overlaps_test");
 	film->set_container (Ratio::from_id ("185"));
-	shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/test.mp4"));
-	shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
-	shared_ptr<FFmpegContent> C (new FFmpegContent (film, "test/data/test.mp4"));
+
+	/* This content is 3s long */
+	shared_ptr<FFmpegContent> A = make_shared<FFmpegContent> (film, "test/data/test.mp4");
+	shared_ptr<FFmpegContent> B = make_shared<FFmpegContent> (film, "test/data/test.mp4");
+	shared_ptr<FFmpegContent> C = make_shared<FFmpegContent> (film, "test/data/test.mp4");
 
 	film->examine_and_add_content (A);
 	film->examine_and_add_content (B);
 	film->examine_and_add_content (C);
 	wait_for_jobs ();
 
-	BOOST_CHECK_EQUAL (A->full_length(), DCPTime (280000));
+	BOOST_CHECK_EQUAL (A->full_length(), DCPTime (288000));
 
 	A->set_position (DCPTime::from_seconds (0));
 	B->set_position (DCPTime::from_seconds (10));
 	C->set_position (DCPTime::from_seconds (20));
 
-	shared_ptr<Player> player = film->make_player ();
+	shared_ptr<Player> player = make_shared<Player> (film, film->playlist ());
 
-	list<shared_ptr<Piece> > o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (0), DCPTime::from_seconds (5));
-	BOOST_CHECK_EQUAL (o.size(), 1);
+	list<shared_ptr<Piece> > o = player->overlaps (DCPTime::from_seconds (0), DCPTime::from_seconds (5), &valid);
+	BOOST_CHECK_EQUAL (o.size(), 1U);
 	BOOST_CHECK_EQUAL (o.front()->content, A);
 
-	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (5), DCPTime::from_seconds (8));
-	BOOST_CHECK_EQUAL (o.size(), 0);
+	o = player->overlaps (DCPTime::from_seconds (5), DCPTime::from_seconds (8), &valid);
+	BOOST_CHECK_EQUAL (o.size(), 0U);
 
-	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (12));
-	BOOST_CHECK_EQUAL (o.size(), 1);
+	o = player->overlaps (DCPTime::from_seconds (8), DCPTime::from_seconds (12), &valid);
+	BOOST_CHECK_EQUAL (o.size(), 1U);
 	BOOST_CHECK_EQUAL (o.front()->content, B);
 
-	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (2), DCPTime::from_seconds (12));
-	BOOST_CHECK_EQUAL (o.size(), 2);
+	o = player->overlaps (DCPTime::from_seconds (2), DCPTime::from_seconds (12), &valid);
+	BOOST_CHECK_EQUAL (o.size(), 2U);
 	BOOST_CHECK_EQUAL (o.front()->content, A);
 	BOOST_CHECK_EQUAL (o.back()->content, B);
 
-	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (11));
-	BOOST_CHECK_EQUAL (o.size(), 1);
+	o = player->overlaps (DCPTime::from_seconds (8), DCPTime::from_seconds (11), &valid);
+	BOOST_CHECK_EQUAL (o.size(), 1U);
 	BOOST_CHECK_EQUAL (o.front()->content, B);
 }
 
@@ -83,14 +94,14 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
 {
 	shared_ptr<Film> film = new_test_film ("player_silence_padding_test");
 	film->set_name ("player_silence_padding_test");
-	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> c = make_shared<FFmpegContent> (film, "test/data/test.mp4");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
-	
+
 	film->examine_and_add_content (c);
 	wait_for_jobs ();
 
-	shared_ptr<Player> player = film->make_player ();
+	shared_ptr<Player> player = make_shared<Player> (film, film->playlist ());
 	shared_ptr<AudioBuffers> test = player->get_audio (DCPTime (0), DCPTime::from_seconds (1), true);
 	BOOST_CHECK_EQUAL (test->frames(), 48000);
 	BOOST_CHECK_EQUAL (test->channels(), film->audio_channels ());
@@ -101,4 +112,3 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
 		}
 	}
 }
-