projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add header guard.
[dcpomatic.git]
/
test
/
reels_test.cc
diff --git
a/test/reels_test.cc
b/test/reels_test.cc
index 10fdc6c1ba440d845273dc724f64d4bcff1369af..7fbf77f74c41423fae4f6ba6ffd5e040c5c60dc8 100644
(file)
--- a/
test/reels_test.cc
+++ b/
test/reels_test.cc
@@
-110,21
+110,21
@@
BOOST_AUTO_TEST_CASE (reels_test2)
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
{
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
{
-
shared_ptr<ImageContent> c (new ImageContent("test/data/flat_red.png")
);
+
auto c = make_shared<ImageContent>("test/data/flat_red.png"
);
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
}
{
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
}
{
-
shared_ptr<ImageContent> c (new ImageContent("test/data/flat_green.png")
);
+
auto c = make_shared<ImageContent>("test/data/flat_green.png"
);
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
}
{
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
}
{
-
shared_ptr<ImageContent> c (new ImageContent("test/data/flat_blue.png")
);
+
auto c = make_shared<ImageContent>("test/data/flat_blue.png"
);
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
film->examine_and_add_content (c);
BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
@@
-200,7
+200,7
@@
BOOST_AUTO_TEST_CASE (reels_test4)
/* 4 piece of 1s-long content */
shared_ptr<ImageContent> content[4];
for (int i = 0; i < 4; ++i) {
/* 4 piece of 1s-long content */
shared_ptr<ImageContent> content[4];
for (int i = 0; i < 4; ++i) {
- content[i]
.reset (new ImageContent("test/data/flat_green.png")
);
+ content[i]
= make_shared<ImageContent>("test/data/flat_green.png"
);
film->examine_and_add_content (content[i]);
BOOST_REQUIRE (!wait_for_jobs());
content[i]->video->set_length (24);
film->examine_and_add_content (content[i]);
BOOST_REQUIRE (!wait_for_jobs());
content[i]->video->set_length (24);
@@
-240,6
+240,7
@@
BOOST_AUTO_TEST_CASE (reels_test4)
BOOST_AUTO_TEST_CASE (reels_test5)
{
auto dcp = make_shared<DCPContent>("test/data/reels_test4");
BOOST_AUTO_TEST_CASE (reels_test5)
{
auto dcp = make_shared<DCPContent>("test/data/reels_test4");
+ dcp->check_font_ids();
auto film = new_test_film2 ("reels_test5", {dcp});
film->set_sequence (false);
auto film = new_test_film2 ("reels_test5", {dcp});
film->set_sequence (false);
@@
-257,7
+258,7
@@
BOOST_AUTO_TEST_CASE (reels_test5)
}
{
}
{
- dcp->set_trim_start
(ContentTime::from_seconds
(0.5));
+ dcp->set_trim_start
(film, ContentTime::from_seconds
(0.5));
auto p = dcp->reels (film);
BOOST_REQUIRE_EQUAL (p.size(), 4U);
auto i = p.begin();
auto p = dcp->reels (film);
BOOST_REQUIRE_EQUAL (p.size(), 4U);
auto i = p.begin();
@@
-279,7
+280,7
@@
BOOST_AUTO_TEST_CASE (reels_test5)
}
{
}
{
- dcp->set_trim_start
(ContentTime::from_seconds
(1.5));
+ dcp->set_trim_start
(film, ContentTime::from_seconds
(1.5));
auto p = dcp->reels (film);
BOOST_REQUIRE_EQUAL (p.size(), 3U);
auto i = p.begin();
auto p = dcp->reels (film);
BOOST_REQUIRE_EQUAL (p.size(), 3U);
auto i = p.begin();
@@
-314,8
+315,8
@@
BOOST_AUTO_TEST_CASE (reels_test6)
*/
BOOST_AUTO_TEST_CASE (reels_test7)
{
*/
BOOST_AUTO_TEST_CASE (reels_test7)
{
- auto A = content_factory("test/data/flat_red.png")
.front()
;
- auto B = content_factory("test/data/awkward_length.wav")
.front()
;
+ auto A = content_factory("test/data/flat_red.png")
[0]
;
+ auto B = content_factory("test/data/awkward_length.wav")
[0]
;
auto film = new_test_film2 ("reels_test7", { A, B });
film->set_video_frame_rate (24);
A->video->set_length (2 * 24);
auto film = new_test_film2 ("reels_test7", { A, B });
film->set_video_frame_rate (24);
A->video->set_length (2 * 24);
@@
-350,7
+351,7
@@
BOOST_AUTO_TEST_CASE (reels_test9)
make_and_verify_dcp (film);
auto B = make_shared<DCPContent>(film->dir(film->dcp_name()));
make_and_verify_dcp (film);
auto B = make_shared<DCPContent>(film->dir(film->dcp_name()));
- auto film2 = new_test_film2("reels_test9b", {B, content_factory("test/data/dcp_sub4.xml")
.front()
});
+ auto film2 = new_test_film2("reels_test9b", {B, content_factory("test/data/dcp_sub4.xml")
[0]
});
B->set_reference_video(true);
B->set_reference_audio(true);
film2->set_reel_type(ReelType::BY_VIDEO_CONTENT);
B->set_reference_video(true);
B->set_reference_audio(true);
film2->set_reel_type(ReelType::BY_VIDEO_CONTENT);
@@
-385,7
+386,7
@@
BOOST_AUTO_TEST_CASE (reels_test10)
/* Now try to make the VF; this used to fail */
auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
/* Now try to make the VF; this used to fail */
auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
- auto vf = new_test_film2("reels_test10_vf", {ov_dcp, content_factory("test/data/15s.srt")
.front()
});
+ auto vf = new_test_film2("reels_test10_vf", {ov_dcp, content_factory("test/data/15s.srt")
[0]
});
vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
ov_dcp->set_reference_video (true);
ov_dcp->set_reference_audio (true);
vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
ov_dcp->set_reference_video (true);
ov_dcp->set_reference_audio (true);
@@
-410,7
+411,7
@@
BOOST_AUTO_TEST_CASE (reels_test11)
auto film = new_test_film2 ("reels_test11", {A});
film->set_video_frame_rate (24);
A->video->set_length (240);
auto film = new_test_film2 ("reels_test11", {A});
film->set_video_frame_rate (24);
A->video->set_length (240);
- A->set_video_frame_rate
(
24);
+ A->set_video_frame_rate
(film,
24);
A->set_position (film, DCPTime::from_seconds(1));
film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
make_and_verify_dcp (film);
A->set_position (film, DCPTime::from_seconds(1));
film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
make_and_verify_dcp (film);
@@
-439,11
+440,11
@@
BOOST_AUTO_TEST_CASE (reels_test12)
film->set_sequence (false);
A->video->set_length (240);
film->set_sequence (false);
A->video->set_length (240);
- A->set_video_frame_rate
(
24);
+ A->set_video_frame_rate
(film,
24);
A->set_position (film, DCPTime::from_seconds(1));
B->video->set_length (120);
A->set_position (film, DCPTime::from_seconds(1));
B->video->set_length (120);
- B->set_video_frame_rate
(
24);
+ B->set_video_frame_rate
(film,
24);
B->set_position (film, DCPTime::from_seconds(14));
auto r = film->reels ();
B->set_position (film, DCPTime::from_seconds(14));
auto r = film->reels ();
@@
-616,7
+617,7
@@
BOOST_AUTO_TEST_CASE (repeated_dcp_into_reels)
for (int i = 0; i < 4; ++i) {
original_dcp[i]->set_position(film2, DCPTime::from_frames(total_frames * i / 4, frame_rate));
for (int i = 0; i < 4; ++i) {
original_dcp[i]->set_position(film2, DCPTime::from_frames(total_frames * i / 4, frame_rate));
- original_dcp[i]->set_trim_start(ContentTime::from_frames(total_frames * i / 4, frame_rate));
+ original_dcp[i]->set_trim_start(
film2,
ContentTime::from_frames(total_frames * i / 4, frame_rate));
original_dcp[i]->set_trim_end (ContentTime::from_frames(total_frames * (4 - i - 1) / 4, frame_rate));
original_dcp[i]->set_reference_video(true);
original_dcp[i]->set_reference_audio(true);
original_dcp[i]->set_trim_end (ContentTime::from_frames(total_frames * (4 - i - 1) / 4, frame_rate));
original_dcp[i]->set_reference_video(true);
original_dcp[i]->set_reference_audio(true);