projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various alignment adjustments.
[dcpomatic.git]
/
test
/
butler_test.cc
diff --git
a/test/butler_test.cc
b/test/butler_test.cc
index dae098e308eb339f6dcfe2e8b7d1d6ec06bc7ffc..99bd95fce38307b499b91ca15612c554f224ad1a 100644
(file)
--- a/
test/butler_test.cc
+++ b/
test/butler_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2017
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,6
+18,7
@@
*/
*/
+
#include "lib/butler.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/butler.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
@@
-28,38
+29,45
@@
#include "test.h"
#include <boost/test/unit_test.hpp>
#include "test.h"
#include <boost/test/unit_test.hpp>
-using boost::shared_ptr;
+
+using std::make_shared;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
+
BOOST_AUTO_TEST_CASE (butler_test1)
{
BOOST_AUTO_TEST_CASE (butler_test1)
{
-
shared_ptr<Film>
film = new_test_film ("butler_test1");
- film->set_dcp_content_type (DCPContentType::from_isdcf_name
("FTR"));
+
auto
film = new_test_film ("butler_test1");
+ film->set_dcp_content_type (DCPContentType::from_isdcf_name("FTR"));
film->set_name ("butler_test1");
film->set_container (Ratio::from_id ("185"));
film->set_name ("butler_test1");
film->set_container (Ratio::from_id ("185"));
-
shared_ptr<Content> video = content_factory(film, "test/data/flat_red.png").front
();
+
auto video = content_factory("test/data/flat_red.png").front
();
film->examine_and_add_content (video);
film->examine_and_add_content (video);
-
shared_ptr<Content> audio = content_factory(film, "test/data/staircase.wav").front
();
+
auto audio = content_factory("test/data/staircase.wav").front
();
film->examine_and_add_content (audio);
BOOST_REQUIRE (!wait_for_jobs ());
film->set_audio_channels (6);
/* This is the map of the player output (5.1) to the butler output (also 5.1) */
film->examine_and_add_content (audio);
BOOST_REQUIRE (!wait_for_jobs ());
film->set_audio_channels (6);
/* This is the map of the player output (5.1) to the butler output (also 5.1) */
-
AudioMapping
map = AudioMapping (6, 6);
+
auto
map = AudioMapping (6, 6);
for (int i = 0; i < 6; ++i) {
map.set (i, i, 1);
}
for (int i = 0; i < 6; ++i) {
map.set (i, i, 1);
}
- Butler butler (
shared_ptr<Player>(new Player(film, film->playlist())), film->log(), map, 6
);
+ Butler butler (
film, make_shared<Player>(film, false), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, false, false
);
- BOOST_CHECK (butler.get_video().second == DCPTime());
- BOOST_CHECK (butler.get_video().second == DCPTime::from_frames(1, 24));
- BOOST_CHECK (butler.get_video().second == DCPTime::from_frames(2, 24));
+ BOOST_CHECK (butler.get_video(
true, 0
).second == DCPTime());
+ BOOST_CHECK (butler.get_video(
true, 0
).second == DCPTime::from_frames(1, 24));
+ BOOST_CHECK (butler.get_video(
true, 0
).second == DCPTime::from_frames(2, 24));
/* XXX: check the frame contents */
float buffer[256 * 6];
/* XXX: check the frame contents */
float buffer[256 * 6];
- BOOST_REQUIRE (
!butler.get_audio (buffer, 256
));
+ BOOST_REQUIRE (
butler.get_audio(buffer, 256) == DCPTime(
));
for (int i = 0; i < 256; ++i) {
BOOST_REQUIRE_EQUAL (buffer[i * 6 + 0], 0);
BOOST_REQUIRE_EQUAL (buffer[i * 6 + 1], 0);
for (int i = 0; i < 256; ++i) {
BOOST_REQUIRE_EQUAL (buffer[i * 6 + 0], 0);
BOOST_REQUIRE_EQUAL (buffer[i * 6 + 1], 0);