projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cd92063
)
Fix incorrect sign on boost test constants.
author
Carl Hetherington
<cth@carlh.net>
Tue, 29 Sep 2020 18:55:16 +0000
(20:55 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 12 Oct 2020 15:33:27 +0000
(17:33 +0200)
22 files changed:
platform/osx/set_paths.sh
patch
|
blob
|
history
test/audio_analysis_test.cc
patch
|
blob
|
history
test/audio_mapping_test.cc
patch
|
blob
|
history
test/audio_merger_test.cc
patch
|
blob
|
history
test/closed_caption_test.cc
patch
|
blob
|
history
test/create_cli_test.cc
patch
|
blob
|
history
test/dcp_subtitle_test.cc
patch
|
blob
|
history
test/dcpomatic_time_test.cc
patch
|
blob
|
history
test/digest_test.cc
patch
|
blob
|
history
test/empty_test.cc
patch
|
blob
|
history
test/import_dcp_test.cc
patch
|
blob
|
history
test/isdcf_name_test.cc
patch
|
blob
|
history
test/no_use_video_test.cc
patch
|
blob
|
history
test/player_test.cc
patch
|
blob
|
history
test/reel_writer_test.cc
patch
|
blob
|
history
test/reels_test.cc
patch
|
blob
|
history
test/subtitle_reel_number_test.cc
patch
|
blob
|
history
test/subtitle_reel_test.cc
patch
|
blob
|
history
test/time_calculation_test.cc
patch
|
blob
|
history
test/torture_test.cc
patch
|
blob
|
history
test/util_test.cc
patch
|
blob
|
history
test/vf_test.cc
patch
|
blob
|
history
diff --git
a/platform/osx/set_paths.sh
b/platform/osx/set_paths.sh
index 5a84a82d951e797eb389cc45f5d450826c8a946f..68db2e2b2759f36959bf788eaec8a5277b70d866 100644
(file)
--- a/
platform/osx/set_paths.sh
+++ b/
platform/osx/set_paths.sh
@@
-1,4
+1,4
@@
-base=$HOME/
dcpomatic
+base=$HOME/
test
env=$HOME/osx-environment
sdk=$HOME/SDK
env=$HOME/osx-environment
sdk=$HOME/SDK
diff --git
a/test/audio_analysis_test.cc
b/test/audio_analysis_test.cc
index 2f51f7c4fd42f797db7847b6a0778279e47e1588..4613f4aead464f40b8d5f5b9fbc190f31633d81d 100644
(file)
--- a/
test/audio_analysis_test.cc
+++ b/
test/audio_analysis_test.cc
@@
-89,7
+89,7
@@
BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
}
}
}
}
- BOOST_REQUIRE_EQUAL (b.sample_peak().size(), 3);
+ BOOST_REQUIRE_EQUAL (b.sample_peak().size(), 3
U
);
for (int i = 0; i < channels; ++i) {
BOOST_CHECK_CLOSE (b.sample_peak()[i].peak, peak[i].peak, 1);
BOOST_CHECK_EQUAL (b.sample_peak()[i].time.get(), peak[i].time.get());
for (int i = 0; i < channels; ++i) {
BOOST_CHECK_CLOSE (b.sample_peak()[i].peak, peak[i].peak, 1);
BOOST_CHECK_EQUAL (b.sample_peak()[i].time.get(), peak[i].time.get());
diff --git
a/test/audio_mapping_test.cc
b/test/audio_mapping_test.cc
index 0565429fb4859fef1136c80a2751a2028c27c32c..0acc922b6d30de2448de05c2ae71c519510c49f6 100644
(file)
--- a/
test/audio_mapping_test.cc
+++ b/
test/audio_mapping_test.cc
@@
-48,7
+48,7
@@
BOOST_AUTO_TEST_CASE (audio_mapping_test)
}
list<int> mapped = four.mapped_output_channels ();
}
list<int> mapped = four.mapped_output_channels ();
- BOOST_CHECK_EQUAL (mapped.size(), 1);
+ BOOST_CHECK_EQUAL (mapped.size(), 1
U
);
BOOST_CHECK_EQUAL (mapped.front(), 1);
four.make_zero ();
BOOST_CHECK_EQUAL (mapped.front(), 1);
four.make_zero ();
diff --git
a/test/audio_merger_test.cc
b/test/audio_merger_test.cc
index 2ac42964ad80318732cc6dc5a19e59e2054fcdf2..3a274ff1aeb8ba2d21f1c72d88b458d93d9ea5b0 100644
(file)
--- a/
test/audio_merger_test.cc
+++ b/
test/audio_merger_test.cc
@@
-66,7
+66,7
@@
BOOST_AUTO_TEST_CASE (audio_merger_test1)
push (merger, 0, 64, 22);
list<pair<shared_ptr<AudioBuffers>, DCPTime> > tb = merger.pull (DCPTime::from_frames (22, sampling_rate));
push (merger, 0, 64, 22);
list<pair<shared_ptr<AudioBuffers>, DCPTime> > tb = merger.pull (DCPTime::from_frames (22, sampling_rate));
- BOOST_REQUIRE (tb.size() == 1);
+ BOOST_REQUIRE (tb.size() == 1
U
);
BOOST_CHECK (tb.front().first != shared_ptr<const AudioBuffers> ());
BOOST_CHECK_EQUAL (tb.front().first->frames(), 22);
BOOST_CHECK_EQUAL (tb.front().second.get(), 0);
BOOST_CHECK (tb.front().first != shared_ptr<const AudioBuffers> ());
BOOST_CHECK_EQUAL (tb.front().first->frames(), 22);
BOOST_CHECK_EQUAL (tb.front().second.get(), 0);
@@
-77,7
+77,7
@@
BOOST_AUTO_TEST_CASE (audio_merger_test1)
}
tb = merger.pull (DCPTime::from_frames (22 + 64, sampling_rate));
}
tb = merger.pull (DCPTime::from_frames (22 + 64, sampling_rate));
- BOOST_REQUIRE (tb.size() == 1);
+ BOOST_REQUIRE (tb.size() == 1
U
);
BOOST_CHECK_EQUAL (tb.front().first->frames(), 64);
BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(22, sampling_rate).get());
BOOST_CHECK_EQUAL (tb.front().first->frames(), 64);
BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(22, sampling_rate).get());
@@
-100,7
+100,7
@@
BOOST_AUTO_TEST_CASE (audio_merger_test2)
/* There's nothing from 0 to 9 */
list<pair<shared_ptr<AudioBuffers>, DCPTime> > tb = merger.pull (DCPTime::from_frames (9, sampling_rate));
/* There's nothing from 0 to 9 */
list<pair<shared_ptr<AudioBuffers>, DCPTime> > tb = merger.pull (DCPTime::from_frames (9, sampling_rate));
- BOOST_CHECK_EQUAL (tb.size(), 0);
+ BOOST_CHECK_EQUAL (tb.size(), 0
U
);
/* Then there's our data at 9 */
tb = merger.pull (DCPTime::from_frames (9 + 64, sampling_rate));
/* Then there's our data at 9 */
tb = merger.pull (DCPTime::from_frames (9 + 64, sampling_rate));
@@
-125,7
+125,7
@@
BOOST_AUTO_TEST_CASE (audio_merger_test3)
/* Get them back */
list<pair<shared_ptr<AudioBuffers>, DCPTime> > tb = merger.pull (DCPTime::from_frames (100, sampling_rate));
/* Get them back */
list<pair<shared_ptr<AudioBuffers>, DCPTime> > tb = merger.pull (DCPTime::from_frames (100, sampling_rate));
- BOOST_REQUIRE (tb.size() == 1);
+ BOOST_REQUIRE (tb.size() == 1
U
);
BOOST_CHECK_EQUAL (tb.front().first->frames(), 64);
BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(17, sampling_rate).get());
for (int i = 0; i < 64; ++i) {
BOOST_CHECK_EQUAL (tb.front().first->frames(), 64);
BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(17, sampling_rate).get());
for (int i = 0; i < 64; ++i) {
@@
-133,7
+133,7
@@
BOOST_AUTO_TEST_CASE (audio_merger_test3)
}
tb = merger.pull (DCPTime::from_frames (200, sampling_rate));
}
tb = merger.pull (DCPTime::from_frames (200, sampling_rate));
- BOOST_REQUIRE (tb.size() == 1);
+ BOOST_REQUIRE (tb.size() == 1
U
);
BOOST_CHECK_EQUAL (tb.front().first->frames(), 64);
BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(114, sampling_rate).get());
for (int i = 0; i < 64; ++i) {
BOOST_CHECK_EQUAL (tb.front().first->frames(), 64);
BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(114, sampling_rate).get());
for (int i = 0; i < 64; ++i) {
diff --git
a/test/closed_caption_test.cc
b/test/closed_caption_test.cc
index b50430d4819e6e3a51b26560183e31f36ff95ac5..283ce6b9370a1c2774f633e01e908da996f9a201 100644
(file)
--- a/
test/closed_caption_test.cc
+++ b/
test/closed_caption_test.cc
@@
-51,8
+51,8
@@
BOOST_AUTO_TEST_CASE (closed_caption_test1)
dcp::DCP check (film->dir(film->dcp_name()));
check.read ();
dcp::DCP check (film->dir(film->dcp_name()));
check.read ();
- BOOST_REQUIRE_EQUAL (check.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (check.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1
U
);
BOOST_REQUIRE (!check.cpls().front()->reels().front()->closed_captions().empty());
}
BOOST_REQUIRE (!check.cpls().front()->reels().front()->closed_captions().empty());
}
@@
-81,10
+81,10
@@
BOOST_AUTO_TEST_CASE (closed_caption_test2)
dcp::DCP check (film->dir(film->dcp_name()));
check.read ();
dcp::DCP check (film->dir(film->dcp_name()));
check.read ();
- BOOST_REQUIRE_EQUAL (check.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (check.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1
U
);
list<shared_ptr<dcp::ReelClosedCaptionAsset> > ccaps = check.cpls().front()->reels().front()->closed_captions();
list<shared_ptr<dcp::ReelClosedCaptionAsset> > ccaps = check.cpls().front()->reels().front()->closed_captions();
- BOOST_REQUIRE_EQUAL (ccaps.size(), 3);
+ BOOST_REQUIRE_EQUAL (ccaps.size(), 3
U
);
list<shared_ptr<dcp::ReelClosedCaptionAsset> >::const_iterator i = ccaps.begin ();
BOOST_CHECK_EQUAL ((*i)->annotation_text(), "First track");
list<shared_ptr<dcp::ReelClosedCaptionAsset> >::const_iterator i = ccaps.begin ();
BOOST_CHECK_EQUAL ((*i)->annotation_text(), "First track");
diff --git
a/test/create_cli_test.cc
b/test/create_cli_test.cc
index e88e0820bd660d31b571e7e4cd31b6338edce4fb..747f0f0452444c3034268e3de90e2d52667499c5 100644
(file)
--- a/
test/create_cli_test.cc
+++ b/
test/create_cli_test.cc
@@
-127,7
+127,7
@@
BOOST_AUTO_TEST_CASE (create_cli_test)
BOOST_CHECK_EQUAL (cc.still_length, 42);
BOOST_REQUIRE (cc.output_dir);
BOOST_CHECK_EQUAL (*cc.output_dir, "flaps");
BOOST_CHECK_EQUAL (cc.still_length, 42);
BOOST_REQUIRE (cc.output_dir);
BOOST_CHECK_EQUAL (*cc.output_dir, "flaps");
- BOOST_REQUIRE_EQUAL (cc.content.size(), 3);
+ BOOST_REQUIRE_EQUAL (cc.content.size(), 3
U
);
BOOST_CHECK_EQUAL (cc.content[0].path, "fred");
BOOST_CHECK_EQUAL (cc.content[0].frame_type, VIDEO_FRAME_TYPE_2D);
BOOST_CHECK_EQUAL (cc.content[1].path, "jim");
BOOST_CHECK_EQUAL (cc.content[0].path, "fred");
BOOST_CHECK_EQUAL (cc.content[0].frame_type, VIDEO_FRAME_TYPE_2D);
BOOST_CHECK_EQUAL (cc.content[1].path, "jim");
@@
-136,7
+136,7
@@
BOOST_AUTO_TEST_CASE (create_cli_test)
BOOST_CHECK_EQUAL (cc.content[2].frame_type, VIDEO_FRAME_TYPE_2D);
cc = run ("dcpomatic2_create --left-eye left.mp4 --right-eye right.mp4");
BOOST_CHECK_EQUAL (cc.content[2].frame_type, VIDEO_FRAME_TYPE_2D);
cc = run ("dcpomatic2_create --left-eye left.mp4 --right-eye right.mp4");
- BOOST_REQUIRE_EQUAL (cc.content.size(), 2);
+ BOOST_REQUIRE_EQUAL (cc.content.size(), 2
U
);
BOOST_CHECK_EQUAL (cc.content[0].path, "left.mp4");
BOOST_CHECK_EQUAL (cc.content[0].frame_type, VIDEO_FRAME_TYPE_3D_LEFT);
BOOST_CHECK_EQUAL (cc.content[1].path, "right.mp4");
BOOST_CHECK_EQUAL (cc.content[0].path, "left.mp4");
BOOST_CHECK_EQUAL (cc.content[0].frame_type, VIDEO_FRAME_TYPE_3D_LEFT);
BOOST_CHECK_EQUAL (cc.content[1].path, "right.mp4");
@@
-144,13
+144,13
@@
BOOST_AUTO_TEST_CASE (create_cli_test)
BOOST_CHECK_EQUAL (cc.fourk, false);
cc = run ("dcpomatic2_create --fourk foo.mp4");
BOOST_CHECK_EQUAL (cc.fourk, false);
cc = run ("dcpomatic2_create --fourk foo.mp4");
- BOOST_REQUIRE_EQUAL (cc.content.size(), 1);
+ BOOST_REQUIRE_EQUAL (cc.content.size(), 1
U
);
BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4");
BOOST_CHECK_EQUAL (cc.fourk, true);
BOOST_CHECK (!cc.error);
cc = run ("dcpomatic2_create --j2k-bandwidth 120 foo.mp4");
BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4");
BOOST_CHECK_EQUAL (cc.fourk, true);
BOOST_CHECK (!cc.error);
cc = run ("dcpomatic2_create --j2k-bandwidth 120 foo.mp4");
- BOOST_REQUIRE_EQUAL (cc.content.size(), 1);
+ BOOST_REQUIRE_EQUAL (cc.content.size(), 1
U
);
BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4");
BOOST_REQUIRE (cc.j2k_bandwidth);
BOOST_CHECK_EQUAL (*cc.j2k_bandwidth, 120000000);
BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4");
BOOST_REQUIRE (cc.j2k_bandwidth);
BOOST_CHECK_EQUAL (*cc.j2k_bandwidth, 120000000);
diff --git
a/test/dcp_subtitle_test.cc
b/test/dcp_subtitle_test.cc
index 80dacbb473dc161fa43a6096e83c351e3ccd1a70..17b997fbc4b5526822322bc8865b6131301ded73 100644
(file)
--- a/
test/dcp_subtitle_test.cc
+++ b/
test/dcp_subtitle_test.cc
@@
-98,7
+98,7
@@
BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
while (!decoder->pass() && !stored) {}
BOOST_REQUIRE (stored);
while (!decoder->pass() && !stored) {}
BOOST_REQUIRE (stored);
- BOOST_REQUIRE_EQUAL (stored->subs.size(), 2);
+ BOOST_REQUIRE_EQUAL (stored->subs.size(), 2
U
);
BOOST_CHECK_EQUAL (stored->subs.front().text(), "Noch mal.");
BOOST_CHECK_EQUAL (stored->subs.back().text(), "Encore une fois.");
}
BOOST_CHECK_EQUAL (stored->subs.front().text(), "Noch mal.");
BOOST_CHECK_EQUAL (stored->subs.back().text(), "Encore une fois.");
}
@@
-180,7
+180,7
@@
BOOST_AUTO_TEST_CASE (dcp_subtitle_test4)
cxml::Document doc ("DCSubtitle");
doc.read_file (subtitle_file (film));
cxml::Document doc ("DCSubtitle");
doc.read_file (subtitle_file (film));
- BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1);
+ BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1
U
);
}
static
}
static
@@
-213,7
+213,7
@@
BOOST_AUTO_TEST_CASE (dcp_subtitle_test5)
cxml::Document doc ("DCSubtitle");
doc.read_file (subtitle_file(film));
cxml::Document doc ("DCSubtitle");
doc.read_file (subtitle_file(film));
- BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1);
+ BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1
U
);
BOOST_CHECK (doc.node_children("LoadFont").front()->string_attribute("Id") != "");
check_font_tags (doc.node_children());
BOOST_CHECK (doc.node_children("LoadFont").front()->string_attribute("Id") != "");
check_font_tags (doc.node_children());
diff --git
a/test/dcpomatic_time_test.cc
b/test/dcpomatic_time_test.cc
index 5b58c369b047fe3a9b05ae10777d819258d302d3..b343a1376b608bc4bef4581354504546ec49eca0 100644
(file)
--- a/
test/dcpomatic_time_test.cc
+++ b/
test/dcpomatic_time_test.cc
@@
-244,7
+244,7
@@
BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test1)
p.push_back (A);
p.push_back (B);
list<DCPTimePeriod> q = coalesce (p);
p.push_back (A);
p.push_back (B);
list<DCPTimePeriod> q = coalesce (p);
- BOOST_REQUIRE_EQUAL (q.size(), 2);
+ BOOST_REQUIRE_EQUAL (q.size(), 2
U
);
BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(29)));
BOOST_CHECK (q.back () == DCPTimePeriod(DCPTime(45), DCPTime(91)));
}
BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(29)));
BOOST_CHECK (q.back () == DCPTimePeriod(DCPTime(45), DCPTime(91)));
}
@@
-257,7
+257,7
@@
BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test2)
p.push_back (A);
p.push_back (B);
list<DCPTimePeriod> q = coalesce (p);
p.push_back (A);
p.push_back (B);
list<DCPTimePeriod> q = coalesce (p);
- BOOST_REQUIRE_EQUAL (q.size(), 1);
+ BOOST_REQUIRE_EQUAL (q.size(), 1
U
);
BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91)));
}
BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91)));
}
@@
-269,7
+269,7
@@
BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test3)
p.push_back (A);
p.push_back (B);
list<DCPTimePeriod> q = coalesce (p);
p.push_back (A);
p.push_back (B);
list<DCPTimePeriod> q = coalesce (p);
- BOOST_REQUIRE_EQUAL (q.size(), 1);
+ BOOST_REQUIRE_EQUAL (q.size(), 1
U
);
BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91)));
}
BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91)));
}
@@
-283,7
+283,7
@@
BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test4)
p.push_back (B);
p.push_back (C);
list<DCPTimePeriod> q = coalesce (p);
p.push_back (B);
p.push_back (C);
list<DCPTimePeriod> q = coalesce (p);
- BOOST_REQUIRE_EQUAL (q.size(), 1);
+ BOOST_REQUIRE_EQUAL (q.size(), 1
U
);
BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(106)));
}
BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(106)));
}
@@
-297,7
+297,7
@@
BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test5)
p.push_back (B);
p.push_back (C);
list<DCPTimePeriod> q = coalesce (p);
p.push_back (B);
p.push_back (C);
list<DCPTimePeriod> q = coalesce (p);
- BOOST_REQUIRE_EQUAL (q.size(), 2);
+ BOOST_REQUIRE_EQUAL (q.size(), 2
U
);
BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91)));
BOOST_CHECK (q.back() == DCPTimePeriod(DCPTime(100), DCPTime(106)));
}
BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91)));
BOOST_CHECK (q.back() == DCPTimePeriod(DCPTime(100), DCPTime(106)));
}
diff --git
a/test/digest_test.cc
b/test/digest_test.cc
index 2911a43b3c201dbf37f6dbad4ec47c1319feea7b..5fee9e7346bd9c02ff978383570c1672b7f9a941 100644
(file)
--- a/
test/digest_test.cc
+++ b/
test/digest_test.cc
@@
-78,7
+78,7
@@
BOOST_AUTO_TEST_CASE (digest_test)
dcp::DCP dcp (film->dir (film->dcp_name ()));
dcp.read ();
dcp::DCP dcp (film->dir (film->dcp_name ()));
dcp.read ();
- BOOST_CHECK_EQUAL (dcp.cpls().size(), 1);
+ BOOST_CHECK_EQUAL (dcp.cpls().size(), 1
U
);
list<shared_ptr<dcp::Reel> > reels = dcp.cpls().front()->reels ();
list<shared_ptr<dcp::Reel> >::const_iterator i = reels.begin ();
list<shared_ptr<dcp::Reel> > reels = dcp.cpls().front()->reels ();
list<shared_ptr<dcp::Reel> >::const_iterator i = reels.begin ();
diff --git
a/test/empty_test.cc
b/test/empty_test.cc
index 1588a99480bf0ecccfe74dade2974c7a476351f4..60427ca406b1cc983cb7a83f78fea7f52bde02dc 100644
(file)
--- a/
test/empty_test.cc
+++ b/
test/empty_test.cc
@@
-66,7
+66,7
@@
BOOST_AUTO_TEST_CASE (empty_test1)
contentB->set_position (film, DCPTime::from_frames (7, vfr));
Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
contentB->set_position (film, DCPTime::from_frames (7, vfr));
Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
- BOOST_REQUIRE_EQUAL (black._periods.size(), 2);
+ BOOST_REQUIRE_EQUAL (black._periods.size(), 2
U
);
list<dcpomatic::DCPTimePeriod>::const_iterator i = black._periods.begin();
BOOST_CHECK (i->from == DCPTime::from_frames(0, vfr));
BOOST_CHECK (i->to == DCPTime::from_frames(2, vfr));
list<dcpomatic::DCPTimePeriod>::const_iterator i = black._periods.begin();
BOOST_CHECK (i->from == DCPTime::from_frames(0, vfr));
BOOST_CHECK (i->to == DCPTime::from_frames(2, vfr));
@@
-98,7
+98,7
@@
BOOST_AUTO_TEST_CASE (empty_test2)
contentB->set_position (film, DCPTime::from_frames(7, vfr));
Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
contentB->set_position (film, DCPTime::from_frames(7, vfr));
Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
- BOOST_REQUIRE_EQUAL (black._periods.size(), 1);
+ BOOST_REQUIRE_EQUAL (black._periods.size(), 1
U
);
BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(3, vfr));
BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));
BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(3, vfr));
BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));
@@
-138,7
+138,7
@@
BOOST_AUTO_TEST_CASE (empty_test3)
shared_ptr<Playlist> playlist (new Playlist);
playlist->add (film, contentB);
Empty black (film, playlist, bind(&has_video, _1), playlist->length(film));
shared_ptr<Playlist> playlist (new Playlist);
playlist->add (film, contentB);
Empty black (film, playlist, bind(&has_video, _1), playlist->length(film));
- BOOST_REQUIRE_EQUAL (black._periods.size(), 1);
+ BOOST_REQUIRE_EQUAL (black._periods.size(), 1
U
);
BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(0, vfr));
BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));
BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(0, vfr));
BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));
diff --git
a/test/import_dcp_test.cc
b/test/import_dcp_test.cc
index ad6fc88ca54de8c7fddc14f6c434bff66bd2e6a5..2f33f93f55c3f66c3dada323cdcbe9823a6397ee 100644
(file)
--- a/
test/import_dcp_test.cc
+++ b/
test/import_dcp_test.cc
@@
-125,7
+125,7
@@
BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
BOOST_REQUIRE (!wait_for_jobs());
film2->write_metadata ();
BOOST_REQUIRE (!wait_for_jobs());
film2->write_metadata ();
- BOOST_CHECK_EQUAL (imported->markers().size(), 3);
+ BOOST_CHECK_EQUAL (imported->markers().size(), 3
U
);
map<dcp::Marker, dcpomatic::ContentTime> markers = imported->markers();
BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
map<dcp::Marker, dcpomatic::ContentTime> markers = imported->markers();
BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
@@
-138,11
+138,11
@@
BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
/* Load that film and check that the markers have been loaded */
shared_ptr<Film> film3(new Film(boost::filesystem::path("build/test/import_dcp_markers_test2")));
film3->read_metadata ();
/* Load that film and check that the markers have been loaded */
shared_ptr<Film> film3(new Film(boost::filesystem::path("build/test/import_dcp_markers_test2")));
film3->read_metadata ();
- BOOST_REQUIRE
(film3->content().size() == 1
);
+ BOOST_REQUIRE
_EQUAL (film3->content().size(), 1U
);
shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front());
BOOST_REQUIRE (reloaded);
shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front());
BOOST_REQUIRE (reloaded);
- BOOST_CHECK_EQUAL (reloaded->markers().size(), 3);
+ BOOST_CHECK_EQUAL (reloaded->markers().size(), 3
U
);
markers = reloaded->markers();
BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
markers = reloaded->markers();
BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
@@
-190,7
+190,7
@@
BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
/* Load that film and check that the metadata has been loaded */
shared_ptr<Film> film3(new Film(boost::filesystem::path("build/test/import_dcp_metadata_test2")));
film3->read_metadata ();
/* Load that film and check that the metadata has been loaded */
shared_ptr<Film> film3(new Film(boost::filesystem::path("build/test/import_dcp_metadata_test2")));
film3->read_metadata ();
- BOOST_REQUIRE
(film3->content().size() == 1
);
+ BOOST_REQUIRE
_EQUAL (film3->content().size(), 1U
);
shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front());
BOOST_REQUIRE (reloaded);
shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front());
BOOST_REQUIRE (reloaded);
diff --git
a/test/isdcf_name_test.cc
b/test/isdcf_name_test.cc
index f5d6ff6d390f59e510c90ced298870e7e46c5868..bdb21bfccc42a034b2be7035c842d4fa2643c311 100644
(file)
--- a/
test/isdcf_name_test.cc
+++ b/
test/isdcf_name_test.cc
@@
-70,7
+70,7
@@
BOOST_AUTO_TEST_CASE (isdcf_name_test)
film->set_audio_channels (1);
film->set_resolution (RESOLUTION_4K);
shared_ptr<Content> text = content_factory("test/data/subrip.srt").front();
film->set_audio_channels (1);
film->set_resolution (RESOLUTION_4K);
shared_ptr<Content> text = content_factory("test/data/subrip.srt").front();
- BOOST_REQUIRE_EQUAL (text->text.size(), 1);
+ BOOST_REQUIRE_EQUAL (text->text.size(), 1
U
);
text->text.front()->set_language ("fr");
text->text.front()->set_burn (true);
film->examine_and_add_content (text);
text->text.front()->set_language ("fr");
text->text.front()->set_burn (true);
film->examine_and_add_content (text);
diff --git
a/test/no_use_video_test.cc
b/test/no_use_video_test.cc
index 2577f935b6589a5bc263dcb0ba955635e5191203..d2589d123944dffc1f02445df70102f4c37e4ea9 100644
(file)
--- a/
test/no_use_video_test.cc
+++ b/
test/no_use_video_test.cc
@@
-136,20
+136,20
@@
BOOST_AUTO_TEST_CASE (no_use_video_test3)
dcp::DCP ov_a_check (ov_a->dir(ov_a->dcp_name()));
ov_a_check.read ();
dcp::DCP ov_a_check (ov_a->dir(ov_a->dcp_name()));
ov_a_check.read ();
- BOOST_REQUIRE_EQUAL (ov_a_check.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (ov_a_check.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (ov_a_check.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (ov_a_check.cpls().front()->reels().size(), 1
U
);
shared_ptr<dcp::Reel> ov_a_reel (ov_a_check.cpls().front()->reels().front());
dcp::DCP ov_b_check (ov_b->dir(ov_b->dcp_name()));
ov_b_check.read ();
shared_ptr<dcp::Reel> ov_a_reel (ov_a_check.cpls().front()->reels().front());
dcp::DCP ov_b_check (ov_b->dir(ov_b->dcp_name()));
ov_b_check.read ();
- BOOST_REQUIRE_EQUAL (ov_b_check.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (ov_b_check.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (ov_b_check.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (ov_b_check.cpls().front()->reels().size(), 1
U
);
shared_ptr<dcp::Reel> ov_b_reel (ov_b_check.cpls().front()->reels().front());
dcp::DCP vf_check (vf->dir(vf->dcp_name()));
vf_check.read ();
shared_ptr<dcp::Reel> ov_b_reel (ov_b_check.cpls().front()->reels().front());
dcp::DCP vf_check (vf->dir(vf->dcp_name()));
vf_check.read ();
- BOOST_REQUIRE_EQUAL (vf_check.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (vf_check.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (vf_check.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (vf_check.cpls().front()->reels().size(), 1
U
);
shared_ptr<dcp::Reel> vf_reel (vf_check.cpls().front()->reels().front());
BOOST_CHECK_EQUAL (vf_reel->main_picture()->asset_ref().id(), ov_b_reel->main_picture()->asset_ref().id());
shared_ptr<dcp::Reel> vf_reel (vf_check.cpls().front()->reels().front());
BOOST_CHECK_EQUAL (vf_reel->main_picture()->asset_ref().id(), ov_b_reel->main_picture()->asset_ref().id());
diff --git
a/test/player_test.cc
b/test/player_test.cc
index 2e979eb44f5ea0b067972d5b47237ff7810428fe..a68d76083e51d16bc6515565da8f95911b05fad5 100644
(file)
--- a/
test/player_test.cc
+++ b/
test/player_test.cc
@@
-151,9
+151,9
@@
BOOST_AUTO_TEST_CASE (player_subframe_test)
shared_ptr<Player> player (new Player(film));
player->setup_pieces ();
shared_ptr<Player> player (new Player(film));
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_black._periods.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_black._periods.size(), 1
U
);
BOOST_CHECK (player->_black._periods.front() == DCPTimePeriod(DCPTime::from_frames(3 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
BOOST_CHECK (player->_black._periods.front() == DCPTimePeriod(DCPTime::from_frames(3 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
- BOOST_REQUIRE_EQUAL (player->_silent._periods.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_silent._periods.size(), 1
U
);
BOOST_CHECK (player->_silent._periods.front() == DCPTimePeriod(DCPTime(289920), DCPTime::from_frames(3 * 24 + 1, 24)));
}
BOOST_CHECK (player->_silent._periods.front() == DCPTimePeriod(DCPTime(289920), DCPTime::from_frames(3 * 24 + 1, 24)));
}
@@
-318,7
+318,7
@@
BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
player->Text.connect (bind (&store, &out, _1, _2, _3, _4));
while (!player->pass ()) {}
player->Text.connect (bind (&store, &out, _1, _2, _3, _4));
while (!player->pass ()) {}
- BOOST_CHECK_EQUAL (out.size(), 6);
+ BOOST_CHECK_EQUAL (out.size(), 6
U
);
}
/** Trigger a crash due to the assertion failure in Player::emit_audio */
}
/** Trigger a crash due to the assertion failure in Player::emit_audio */
diff --git
a/test/reel_writer_test.cc
b/test/reel_writer_test.cc
index 5177a5c2f6eacb174706911ce256122af988c54c..51c820ba31a1500210f2bf0a0561d2b121648c80 100644
(file)
--- a/
test/reel_writer_test.cc
+++ b/
test/reel_writer_test.cc
@@
-116,8
+116,8
@@
BOOST_AUTO_TEST_CASE (reel_reuse_video_test)
/* Find main picture and sound asset IDs */
dcp::DCP dcp1 (film->dir(film->dcp_name()));
dcp1.read ();
/* Find main picture and sound asset IDs */
dcp::DCP dcp1 (film->dir(film->dcp_name()));
dcp1.read ();
- BOOST_REQUIRE_EQUAL (dcp1.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (dcp1.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (dcp1.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (dcp1.cpls().front()->reels().size(), 1
U
);
BOOST_REQUIRE (dcp1.cpls().front()->reels().front()->main_picture());
BOOST_REQUIRE (dcp1.cpls().front()->reels().front()->main_sound());
string const picture_id = dcp1.cpls().front()->reels().front()->main_picture()->asset()->id();
BOOST_REQUIRE (dcp1.cpls().front()->reels().front()->main_picture());
BOOST_REQUIRE (dcp1.cpls().front()->reels().front()->main_sound());
string const picture_id = dcp1.cpls().front()->reels().front()->main_picture()->asset()->id();
@@
-131,8
+131,8
@@
BOOST_AUTO_TEST_CASE (reel_reuse_video_test)
/* Video ID should be the same, sound different */
dcp::DCP dcp2 (film->dir(film->dcp_name()));
dcp2.read ();
/* Video ID should be the same, sound different */
dcp::DCP dcp2 (film->dir(film->dcp_name()));
dcp2.read ();
- BOOST_REQUIRE_EQUAL (dcp2.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (dcp2.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (dcp2.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (dcp2.cpls().front()->reels().size(), 1
U
);
BOOST_REQUIRE (dcp2.cpls().front()->reels().front()->main_picture());
BOOST_REQUIRE (dcp2.cpls().front()->reels().front()->main_sound());
BOOST_CHECK_EQUAL (picture_id, dcp2.cpls().front()->reels().front()->main_picture()->asset()->id());
BOOST_REQUIRE (dcp2.cpls().front()->reels().front()->main_picture());
BOOST_REQUIRE (dcp2.cpls().front()->reels().front()->main_sound());
BOOST_CHECK_EQUAL (picture_id, dcp2.cpls().front()->reels().front()->main_picture()->asset()->id());
@@
-146,8
+146,8
@@
BOOST_AUTO_TEST_CASE (reel_reuse_video_test)
/* Video and sound IDs should be different */
dcp::DCP dcp3 (film->dir(film->dcp_name()));
dcp3.read ();
/* Video and sound IDs should be different */
dcp::DCP dcp3 (film->dir(film->dcp_name()));
dcp3.read ();
- BOOST_REQUIRE_EQUAL (dcp3.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (dcp3.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (dcp3.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (dcp3.cpls().front()->reels().size(), 1
U
);
BOOST_REQUIRE (dcp3.cpls().front()->reels().front()->main_picture());
BOOST_REQUIRE (dcp3.cpls().front()->reels().front()->main_sound());
BOOST_CHECK (picture_id != dcp3.cpls().front()->reels().front()->main_picture()->asset()->id());
BOOST_REQUIRE (dcp3.cpls().front()->reels().front()->main_picture());
BOOST_REQUIRE (dcp3.cpls().front()->reels().front()->main_sound());
BOOST_CHECK (picture_id != dcp3.cpls().front()->reels().front()->main_picture()->asset()->id());
diff --git
a/test/reels_test.cc
b/test/reels_test.cc
index 8bf63199b6cf735a9507f33e5436d5f4ad4b7b14..41e206366d5469ecf208992bfec899b9688d074a 100644
(file)
--- a/
test/reels_test.cc
+++ b/
test/reels_test.cc
@@
-59,13
+59,13
@@
BOOST_AUTO_TEST_CASE (reels_test1)
film->set_reel_type (REELTYPE_SINGLE);
list<DCPTimePeriod> r = film->reels ();
film->set_reel_type (REELTYPE_SINGLE);
list<DCPTimePeriod> r = film->reels ();
- BOOST_CHECK_EQUAL (r.size(), 1);
+ BOOST_CHECK_EQUAL (r.size(), 1
U
);
BOOST_CHECK_EQUAL (r.front().from.get(), 0);
BOOST_CHECK_EQUAL (r.front().to.get(), 288000 * 2);
film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
r = film->reels ();
BOOST_CHECK_EQUAL (r.front().from.get(), 0);
BOOST_CHECK_EQUAL (r.front().to.get(), 288000 * 2);
film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
r = film->reels ();
- BOOST_CHECK_EQUAL (r.size(), 2);
+ BOOST_CHECK_EQUAL (r.size(), 2
U
);
BOOST_CHECK_EQUAL (r.front().from.get(), 0);
BOOST_CHECK_EQUAL (r.front().to.get(), 288000);
BOOST_CHECK_EQUAL (r.back().from.get(), 288000);
BOOST_CHECK_EQUAL (r.front().from.get(), 0);
BOOST_CHECK_EQUAL (r.front().to.get(), 288000);
BOOST_CHECK_EQUAL (r.back().from.get(), 288000);
@@
-76,7
+76,7
@@
BOOST_AUTO_TEST_CASE (reels_test1)
/* This is just over 2.5s at 100Mbit/s; should correspond to 60 frames */
film->set_reel_length (31253154);
r = film->reels ();
/* This is just over 2.5s at 100Mbit/s; should correspond to 60 frames */
film->set_reel_length (31253154);
r = film->reels ();
- BOOST_CHECK_EQUAL (r.size(), 3);
+ BOOST_CHECK_EQUAL (r.size(), 3
U
);
list<DCPTimePeriod>::const_iterator i = r.begin ();
BOOST_CHECK_EQUAL (i->from.get(), 0);
BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(60, 24).get());
list<DCPTimePeriod>::const_iterator i = r.begin ();
BOOST_CHECK_EQUAL (i->from.get(), 0);
BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(60, 24).get());
@@
-121,7
+121,7
@@
BOOST_AUTO_TEST_CASE (reels_test2)
}
film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
}
film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
- BOOST_CHECK_EQUAL (film->reels().size(), 3);
+ BOOST_CHECK_EQUAL (film->reels().size(), 3
U
);
BOOST_REQUIRE (!wait_for_jobs());
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
film->make_dcp ();
@@
-140,7
+140,7
@@
BOOST_AUTO_TEST_CASE (reels_test2)
BOOST_REQUIRE (!wait_for_jobs ());
list<DCPTimePeriod> r = film2->reels ();
BOOST_REQUIRE (!wait_for_jobs ());
list<DCPTimePeriod> r = film2->reels ();
- BOOST_CHECK_EQUAL (r.size(), 3);
+ BOOST_CHECK_EQUAL (r.size(), 3
U
);
list<DCPTimePeriod>::const_iterator i = r.begin ();
BOOST_CHECK_EQUAL (i->from.get(), 0);
BOOST_CHECK_EQUAL (i->to.get(), 96000);
list<DCPTimePeriod>::const_iterator i = r.begin ();
BOOST_CHECK_EQUAL (i->from.get(), 0);
BOOST_CHECK_EQUAL (i->to.get(), 96000);
@@
-176,7
+176,7
@@
BOOST_AUTO_TEST_CASE (reels_test3)
BOOST_REQUIRE (!wait_for_jobs());
list<DCPTimePeriod> reels = film->reels();
BOOST_REQUIRE (!wait_for_jobs());
list<DCPTimePeriod> reels = film->reels();
- BOOST_REQUIRE_EQUAL (reels.size(), 4);
+ BOOST_REQUIRE_EQUAL (reels.size(), 4
U
);
list<DCPTimePeriod>::const_iterator i = reels.begin ();
BOOST_CHECK_EQUAL (i->from.get(), 0);
BOOST_CHECK_EQUAL (i->to.get(), 96000);
list<DCPTimePeriod>::const_iterator i = reels.begin ();
BOOST_CHECK_EQUAL (i->from.get(), 0);
BOOST_CHECK_EQUAL (i->to.get(), 96000);
@@
-217,7
+217,7
@@
BOOST_AUTO_TEST_CASE (reels_test4)
BOOST_REQUIRE (!wait_for_jobs());
list<DCPTimePeriod> reels = film->reels();
BOOST_REQUIRE (!wait_for_jobs());
list<DCPTimePeriod> reels = film->reels();
- BOOST_REQUIRE_EQUAL (reels.size(), 4);
+ BOOST_REQUIRE_EQUAL (reels.size(), 4
U
);
list<DCPTimePeriod>::const_iterator i = reels.begin ();
BOOST_CHECK_EQUAL (i->from.get(), 0);
BOOST_CHECK_EQUAL (i->to.get(), 96000);
list<DCPTimePeriod>::const_iterator i = reels.begin ();
BOOST_CHECK_EQUAL (i->from.get(), 0);
BOOST_CHECK_EQUAL (i->to.get(), 96000);
@@
-250,7
+250,7
@@
BOOST_AUTO_TEST_CASE (reels_test5)
{
list<DCPTimePeriod> p = dcp->reels (film);
{
list<DCPTimePeriod> p = dcp->reels (film);
- BOOST_REQUIRE_EQUAL (p.size(), 4);
+ BOOST_REQUIRE_EQUAL (p.size(), 4
U
);
list<DCPTimePeriod>::const_iterator i = p.begin();
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 96000)));
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 96000), DCPTime(4000 + 192000)));
list<DCPTimePeriod>::const_iterator i = p.begin();
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 96000)));
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 96000), DCPTime(4000 + 192000)));
@@
-261,7
+261,7
@@
BOOST_AUTO_TEST_CASE (reels_test5)
{
dcp->set_trim_start (ContentTime::from_seconds (0.5));
list<DCPTimePeriod> p = dcp->reels (film);
{
dcp->set_trim_start (ContentTime::from_seconds (0.5));
list<DCPTimePeriod> p = dcp->reels (film);
- BOOST_REQUIRE_EQUAL (p.size(), 4);
+ BOOST_REQUIRE_EQUAL (p.size(), 4
U
);
list<DCPTimePeriod>::const_iterator i = p.begin();
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
list<DCPTimePeriod>::const_iterator i = p.begin();
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
@@
-272,7
+272,7
@@
BOOST_AUTO_TEST_CASE (reels_test5)
{
dcp->set_trim_end (ContentTime::from_seconds (0.5));
list<DCPTimePeriod> p = dcp->reels (film);
{
dcp->set_trim_end (ContentTime::from_seconds (0.5));
list<DCPTimePeriod> p = dcp->reels (film);
- BOOST_REQUIRE_EQUAL (p.size(), 4);
+ BOOST_REQUIRE_EQUAL (p.size(), 4
U
);
list<DCPTimePeriod>::const_iterator i = p.begin();
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
list<DCPTimePeriod>::const_iterator i = p.begin();
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
@@
-283,7
+283,7
@@
BOOST_AUTO_TEST_CASE (reels_test5)
{
dcp->set_trim_start (ContentTime::from_seconds (1.5));
list<DCPTimePeriod> p = dcp->reels (film);
{
dcp->set_trim_start (ContentTime::from_seconds (1.5));
list<DCPTimePeriod> p = dcp->reels (film);
- BOOST_REQUIRE_EQUAL (p.size(), 3);
+ BOOST_REQUIRE_EQUAL (p.size(), 3
U
);
list<DCPTimePeriod>::const_iterator i = p.begin();
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
list<DCPTimePeriod>::const_iterator i = p.begin();
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
@@
-329,7
+329,7
@@
BOOST_AUTO_TEST_CASE (reels_test7)
A->video->set_length (2 * 24);
film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
A->video->set_length (2 * 24);
film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
- BOOST_REQUIRE_EQUAL (film->reels().size(), 2);
+ BOOST_REQUIRE_EQUAL (film->reels().size(), 2
U
);
BOOST_CHECK (film->reels().front() == DCPTimePeriod(DCPTime(0), DCPTime::from_frames(2 * 24, 24)));
BOOST_CHECK (film->reels().back() == DCPTimePeriod(DCPTime::from_frames(2 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
BOOST_CHECK (film->reels().front() == DCPTimePeriod(DCPTime(0), DCPTime::from_frames(2 * 24, 24)));
BOOST_CHECK (film->reels().back() == DCPTimePeriod(DCPTime::from_frames(2 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
@@
-439,7
+439,7
@@
BOOST_AUTO_TEST_CASE (reels_test11)
BOOST_CHECK_EQUAL (A->end(film).get(), DCPTime::from_seconds(1 + 10).get());
list<DCPTimePeriod> r = film->reels ();
BOOST_CHECK_EQUAL (A->end(film).get(), DCPTime::from_seconds(1 + 10).get());
list<DCPTimePeriod> r = film->reels ();
- BOOST_CHECK_EQUAL (r.size(), 2);
+ BOOST_CHECK_EQUAL (r.size(), 2
U
);
BOOST_CHECK_EQUAL (r.front().from.get(), 0);
BOOST_CHECK_EQUAL (r.front().to.get(), DCPTime::from_seconds(1).get());
BOOST_CHECK_EQUAL (r.back().from.get(), DCPTime::from_seconds(1).get());
BOOST_CHECK_EQUAL (r.front().from.get(), 0);
BOOST_CHECK_EQUAL (r.front().to.get(), DCPTime::from_seconds(1).get());
BOOST_CHECK_EQUAL (r.back().from.get(), DCPTime::from_seconds(1).get());
@@
-471,7
+471,7
@@
BOOST_AUTO_TEST_CASE (reels_test12)
B->set_position (film, DCPTime::from_seconds(14));
list<DCPTimePeriod> r = film->reels ();
B->set_position (film, DCPTime::from_seconds(14));
list<DCPTimePeriod> r = film->reels ();
- BOOST_REQUIRE_EQUAL (r.size(), 4);
+ BOOST_REQUIRE_EQUAL (r.size(), 4
U
);
list<DCPTimePeriod>::const_iterator i = r.begin ();
BOOST_CHECK_EQUAL (i->from.get(), 0);
list<DCPTimePeriod>::const_iterator i = r.begin ();
BOOST_CHECK_EQUAL (i->from.get(), 0);
diff --git
a/test/subtitle_reel_number_test.cc
b/test/subtitle_reel_number_test.cc
index 0726ee2e418bcb76310669b52a0eba07c2e50b09..23e03b7bc6ed8704d79c1148ba8566a498cc6d8a 100644
(file)
--- a/
test/subtitle_reel_number_test.cc
+++ b/
test/subtitle_reel_number_test.cc
@@
-56,9
+56,9
@@
BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
dcp::DCP dcp ("build/test/subtitle_reel_number_test/" + film->dcp_name());
dcp.read ();
dcp::DCP dcp ("build/test/subtitle_reel_number_test/" + film->dcp_name());
dcp.read ();
- BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
+ BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1
U
);
shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
- BOOST_REQUIRE_EQUAL (cpl->reels().size(), 6);
+ BOOST_REQUIRE_EQUAL (cpl->reels().size(), 6
U
);
int n = 1;
BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
int n = 1;
BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
diff --git
a/test/subtitle_reel_test.cc
b/test/subtitle_reel_test.cc
index 7a722b460fde61e4427aea7d09ca5901cd484b47..1565819328b6a7b0944b3d20a89ad4b163d7d198 100644
(file)
--- a/
test/subtitle_reel_test.cc
+++ b/
test/subtitle_reel_test.cc
@@
-64,11
+64,11
@@
BOOST_AUTO_TEST_CASE (subtitle_reel_test)
dcp::DCP dcp ("build/test/subtitle_reel_test/" + film->dcp_name());
dcp.read ();
dcp::DCP dcp ("build/test/subtitle_reel_test/" + film->dcp_name());
dcp.read ();
- BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
+ BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1
U
);
shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
list<shared_ptr<dcp::Reel> > reels = cpl->reels ();
shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
list<shared_ptr<dcp::Reel> > reels = cpl->reels ();
- BOOST_REQUIRE_EQUAL (reels.size(), 2);
+ BOOST_REQUIRE_EQUAL (reels.size(), 2
U
);
list<shared_ptr<dcp::Reel> >::const_iterator i = reels.begin ();
BOOST_REQUIRE ((*i)->main_subtitle());
BOOST_REQUIRE ((*i)->main_subtitle()->asset());
list<shared_ptr<dcp::Reel> >::const_iterator i = reels.begin ();
BOOST_REQUIRE ((*i)->main_subtitle());
BOOST_REQUIRE ((*i)->main_subtitle()->asset());
@@
-80,8
+80,8
@@
BOOST_AUTO_TEST_CASE (subtitle_reel_test)
shared_ptr<dcp::InteropSubtitleAsset> B = boost::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
BOOST_REQUIRE (B);
shared_ptr<dcp::InteropSubtitleAsset> B = boost::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
BOOST_REQUIRE (B);
- BOOST_REQUIRE_EQUAL (A->subtitles().size(), 1);
- BOOST_REQUIRE_EQUAL (B->subtitles().size(), 1);
+ BOOST_REQUIRE_EQUAL (A->subtitles().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (B->subtitles().size(), 1
U
);
/* These times should be the same as they are should be offset from the start of the reel */
BOOST_CHECK (A->subtitles().front()->in() == B->subtitles().front()->in());
/* These times should be the same as they are should be offset from the start of the reel */
BOOST_CHECK (A->subtitles().front()->in() == B->subtitles().front()->in());
diff --git
a/test/time_calculation_test.cc
b/test/time_calculation_test.cc
index dbcf2677becd4195296f135af82a7dc0ee728a0d..636f452d90fc45abfe05db0775b7fbf0b8b08df3 100644
(file)
--- a/
test/time_calculation_test.cc
+++ b/
test/time_calculation_test.cc
@@
-198,7
+198,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
shared_ptr<Piece> piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
shared_ptr<Piece> piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
@@
-210,7
+210,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
@@
-224,7
+224,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
@@
-241,7
+241,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.6)), 15);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.6)), 15);
@@
-253,7
+253,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)), 0);
@@
-270,7
+270,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)), 0);
@@
-289,7
+289,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
@@
-301,7
+301,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
@@
-315,7
+315,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
@@
-333,7
+333,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 24);
@@
-345,7
+345,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
@@
-359,7
+359,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
@@
-373,7
+373,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
content->set_video_frame_rate (29.9978733);
film->set_video_frame_rate (30);
player->setup_pieces ();
content->set_video_frame_rate (29.9978733);
film->set_video_frame_rate (30);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime (3200)), 1);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime (3200)), 1);
@@
-404,7
+404,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
shared_ptr<Piece> piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 12).get(), DCPTime::from_seconds(0.5).get());
shared_ptr<Piece> piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 12).get(), DCPTime::from_seconds(0.5).get());
@@
-416,7
+416,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
@@
-428,7
+428,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
@@
-444,7
+444,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 15).get(), DCPTime::from_seconds(0.6).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 15).get(), DCPTime::from_seconds(0.6).get());
@@
-456,7
+456,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), DCPTime::from_seconds(4.60).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), DCPTime::from_seconds(4.60).get());
@@
-468,7
+468,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (25);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 142080);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), 295680);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 142080);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), 295680);
@@
-486,7
+486,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 12).get(), DCPTime::from_seconds(0.5).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 12).get(), DCPTime::from_seconds(0.5).get());
@@
-498,7
+498,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
@@
-510,7
+510,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
content->set_video_frame_rate (24);
film->set_video_frame_rate (48);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
@@
-527,7
+527,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 24).get(), DCPTime::from_seconds(0.5).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 24).get(), DCPTime::from_seconds(0.5).get());
@@
-539,7
+539,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(4.50).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(4.50).get());
@@
-551,7
+551,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
content->set_video_frame_rate (48);
film->set_video_frame_rate (24);
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(3.00).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(3.00).get());
@@
-582,7
+582,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
shared_ptr<Piece> piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
shared_ptr<Piece> piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
@@
-595,7
+595,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
@@
-610,7
+610,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
@@
-625,7
+625,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (25);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (25);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.6)), 28800);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.6)), 28800);
@@
-638,7
+638,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (25);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (25);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)), 0);
@@
-655,7
+655,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (25);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (25);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)), 0);
@@
-674,7
+674,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (48);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (48);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
@@
-687,7
+687,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
@@
-702,7
+702,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
@@
-720,7
+720,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (48);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (48);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
@@
-733,7
+733,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
@@
-748,7
+748,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
@@
-763,7
+763,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (24);
stream->_frame_rate = 44100;
player->setup_pieces ();
film->set_video_frame_rate (24);
stream->_frame_rate = 44100;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
@@
-776,7
+776,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (24);
stream->_frame_rate = 44100;
player->setup_pieces ();
film->set_video_frame_rate (24);
stream->_frame_rate = 44100;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
@@
-791,7
+791,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (24);
stream->_frame_rate = 44100;
player->setup_pieces ();
film->set_video_frame_rate (24);
stream->_frame_rate = 44100;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
@@
-806,7
+806,7
@@
BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
player->setup_pieces ();
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1
U
);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 54143L * 48000);
}
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 54143L * 48000);
}
diff --git
a/test/torture_test.cc
b/test/torture_test.cc
index 979e1beb84c917cd20e3f71f464d0fb9c5bd9bc0..27b4b5d144cd5194c3fa06abb2bb94bfdaea12b2 100644
(file)
--- a/
test/torture_test.cc
+++ b/
test/torture_test.cc
@@
-90,9
+90,9
@@
BOOST_AUTO_TEST_CASE (torture_test1)
dcp.read ();
list<shared_ptr<dcp::CPL> > cpls = dcp.cpls ();
dcp.read ();
list<shared_ptr<dcp::CPL> > cpls = dcp.cpls ();
- BOOST_REQUIRE_EQUAL (cpls.size(), 1);
+ BOOST_REQUIRE_EQUAL (cpls.size(), 1
U
);
list<shared_ptr<dcp::Reel> > reels = cpls.front()->reels ();
list<shared_ptr<dcp::Reel> > reels = cpls.front()->reels ();
- BOOST_REQUIRE_EQUAL (reels.size(), 1);
+ BOOST_REQUIRE_EQUAL (reels.size(), 1
U
);
/* Check sound */
/* Check sound */
diff --git
a/test/util_test.cc
b/test/util_test.cc
index 1c1091f28fb0e8d983ef7984b874cdeb9c899237..610555ad687a0ce2dc8400846acdd996d823fc95 100644
(file)
--- a/
test/util_test.cc
+++ b/
test/util_test.cc
@@
-98,9
+98,9
@@
BOOST_AUTO_TEST_CASE (tidy_for_filename_test)
BOOST_AUTO_TEST_CASE (utf8_strlen_test)
{
BOOST_AUTO_TEST_CASE (utf8_strlen_test)
{
- BOOST_CHECK_EQUAL (utf8_strlen("hello world"), 11);
- BOOST_CHECK_EQUAL (utf8_strlen("hëllo world"), 11);
- BOOST_CHECK_EQUAL (utf8_strlen("hëłlo wørld"), 11);
+ BOOST_CHECK_EQUAL (utf8_strlen("hello world"), 11
U
);
+ BOOST_CHECK_EQUAL (utf8_strlen("hëllo world"), 11
U
);
+ BOOST_CHECK_EQUAL (utf8_strlen("hëłlo wørld"), 11
U
);
}
#ifdef DCPOMATIC_VARIANT_SWAROOP
}
#ifdef DCPOMATIC_VARIANT_SWAROOP
diff --git
a/test/vf_test.cc
b/test/vf_test.cc
index 6fd0a00e8de3c8596355d38d3943ff14f50a71f0..e0d328447081846ef13aa1f978abfdb31729635d 100644
(file)
--- a/
test/vf_test.cc
+++ b/
test/vf_test.cc
@@
-127,8
+127,8
@@
BOOST_AUTO_TEST_CASE (vf_test2)
dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
ov_c.read ();
dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
ov_c.read ();
- BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1
U
);
BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture());
string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id();
BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound());
BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture());
string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id();
BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound());
@@
-137,8
+137,8
@@
BOOST_AUTO_TEST_CASE (vf_test2)
dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
vf_c.read ();
dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
vf_c.read ();
- BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1
U
);
BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->id(), pic_id);
BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_sound());
BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->id(), pic_id);
BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_sound());
@@
-184,8
+184,8
@@
BOOST_AUTO_TEST_CASE (vf_test3)
dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
vf_c.read ();
dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
vf_c.read ();
- BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1
U
);
BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->entry_point().get_value_or(0), 24);
BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->actual_duration(), 72);
BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->entry_point().get_value_or(0), 24);
BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->actual_duration(), 72);
@@
-234,8
+234,8
@@
BOOST_AUTO_TEST_CASE (vf_test4)
dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
ov_c.read ();
dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
ov_c.read ();
- BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1
U
);
BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture());
string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id();
BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound());
BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture());
string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id();
BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound());
@@
-244,8
+244,8
@@
BOOST_AUTO_TEST_CASE (vf_test4)
dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
vf_c.read ();
dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
vf_c.read ();
- BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 2);
+ BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 2
U
);
BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_picture());
BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().back()->main_picture()->id(), pic_id);
BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_sound());
BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_picture());
BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().back()->main_picture()->id(), pic_id);
BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_sound());
@@
-289,7
+289,7
@@
BOOST_AUTO_TEST_CASE (vf_test5)
/* Check that the selected reel assets are right */
shared_ptr<Player> player (new Player(vf));
list<ReferencedReelAsset> a = player->get_reel_assets();
/* Check that the selected reel assets are right */
shared_ptr<Player> player (new Player(vf));
list<ReferencedReelAsset> a = player->get_reel_assets();
- BOOST_REQUIRE_EQUAL (a.size(), 4);
+ BOOST_REQUIRE_EQUAL (a.size(), 4
U
);
list<ReferencedReelAsset>::const_iterator i = a.begin();
BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000)));
++i;
list<ReferencedReelAsset>::const_iterator i = a.begin();
BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000)));
++i;