projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
test
/
dcp_playback_test.cc
diff --git
a/test/dcp_playback_test.cc
b/test/dcp_playback_test.cc
index 4307fb413541fe424ea4ec19640da5065088e533..ef1b623e78ffc8f7a67ef1f46dbd9ae37628ecb9 100644
(file)
--- a/
test/dcp_playback_test.cc
+++ b/
test/dcp_playback_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,35
+18,53
@@
*/
*/
-#include "lib/film.h"
+
#include "lib/butler.h"
#include "lib/butler.h"
-#include "lib/player.h"
#include "lib/dcp_content.h"
#include "lib/dcp_content.h"
+#include "lib/film.h"
+#include "lib/player.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
#include "test.h"
#include <boost/test/unit_test.hpp>
+
+using std::make_shared;
using std::pair;
using std::pair;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
+
/** Simulate the work that the player does, for profiling */
BOOST_AUTO_TEST_CASE (dcp_playback_test)
{
/** Simulate the work that the player does, for profiling */
BOOST_AUTO_TEST_CASE (dcp_playback_test)
{
-
shared_ptr<Film>
film = new_test_film ("dcp_playback_test");
-
shared_ptr<DCPContent> content (new DCPContent(film, private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV")
);
+
auto
film = new_test_film ("dcp_playback_test");
+
auto content = make_shared<DCPContent>(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"
);
film->examine_and_add_content (content);
film->examine_and_add_content (content);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
+
+ auto butler = std::make_shared<Butler>(
+ film,
+ shared_ptr<Player>(new Player(film)),
+ AudioMapping(6, 6),
+ 6,
+ bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+ VideoRange::FULL,
+ false,
+ true
+ );
- shared_ptr<Butler> butler (new Butler(shared_ptr<Player>(new Player(film, film->playlist())), shared_ptr<Log>(), AudioMapping(6, 6), 6));
- float* audio_buffer = new float[2000*6];
+ auto audio_buffer = new float[2000 * 6];
while (true) {
while (true) {
-
pair<shared_ptr<PlayerVideo>, DCPTime> p = butler->get_video (
);
+
auto p = butler->get_video (true, 0
);
if (!p.first) {
break;
}
/* assuming DCP is 24fps/48kHz */
butler->get_audio (audio_buffer, 2000);
if (!p.first) {
break;
}
/* assuming DCP is 24fps/48kHz */
butler->get_audio (audio_buffer, 2000);
- p.first->image(
optional<dcp::NoteHandler>(), bind(&PlayerVideo::always_rgb, _1)
, false, true);
+ p.first->image(
bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL
, false, true);
}
delete[] audio_buffer;
}
}
delete[] audio_buffer;
}