projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
test
/
dcp_playback_test.cc
diff --git
a/test/dcp_playback_test.cc
b/test/dcp_playback_test.cc
index 120fecede9b17ab4dbfca8b3f43a7b63428f6c1a..fd4c939bd5869e19f7f6554d7e1834321c50a434 100644
(file)
--- a/
test/dcp_playback_test.cc
+++ b/
test/dcp_playback_test.cc
@@
-26,7
+26,7
@@
#include <boost/test/unit_test.hpp>
using std::pair;
#include <boost/test/unit_test.hpp>
using std::pair;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
using boost::optional;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
@@
-43,10
+43,12
@@
BOOST_AUTO_TEST_CASE (dcp_playback_test)
shared_ptr<Butler> butler (
new Butler(
shared_ptr<Butler> butler (
new Butler(
+ film,
shared_ptr<Player>(new Player(film)),
AudioMapping(6, 6),
6,
bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
shared_ptr<Player>(new Player(film)),
AudioMapping(6, 6),
6,
bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+ VIDEO_RANGE_FULL,
false,
true)
);
false,
true)
);
@@
-58,7
+60,7
@@
BOOST_AUTO_TEST_CASE (dcp_playback_test)
}
/* assuming DCP is 24fps/48kHz */
butler->get_audio (audio_buffer, 2000);
}
/* assuming DCP is 24fps/48kHz */
butler->get_audio (audio_buffer, 2000);
- p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true);
+ p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
VIDEO_RANGE_FULL,
false, true);
}
delete[] audio_buffer;
}
}
delete[] audio_buffer;
}