projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix position of content outline (#2108).
[dcpomatic.git]
/
test
/
dcp_playback_test.cc
diff --git
a/test/dcp_playback_test.cc
b/test/dcp_playback_test.cc
index 6c2b0447ca0edaf5b7df1d2dd09e4181750a1105..66a73579820f9cb6a872d8e2061b2e7948c7a125 100644
(file)
--- a/
test/dcp_playback_test.cc
+++ b/
test/dcp_playback_test.cc
@@
-45,24
+45,24
@@
BOOST_AUTO_TEST_CASE (dcp_playback_test)
auto butler = std::make_shared<Butler>(
film,
auto butler = std::make_shared<Butler>(
film,
- make_shared<Player>(film, Image::Alignment::
COMPACT
),
+ make_shared<Player>(film, Image::Alignment::
PADDED
),
AudioMapping(6, 6),
6,
bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
VideoRange::FULL,
AudioMapping(6, 6),
6,
bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
VideoRange::FULL,
- Image::Alignment::
COMPACT
,
+ Image::Alignment::
PADDED
,
true,
false
);
auto audio_buffer = new float[2000 * 6];
while (true) {
true,
false
);
auto audio_buffer = new float[2000 * 6];
while (true) {
- auto p = butler->get_video (
true
, 0);
+ auto p = butler->get_video (
Butler::Behaviour::BLOCKING
, 0);
if (!p.first) {
break;
}
/* assuming DCP is 24fps/48kHz */
if (!p.first) {
break;
}
/* assuming DCP is 24fps/48kHz */
- butler->get_audio (audio_buffer, 2000);
+ butler->get_audio (
Butler::Behaviour::BLOCKING,
audio_buffer, 2000);
p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
}
delete[] audio_buffer;
p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
}
delete[] audio_buffer;