projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
475d598
)
Fix test for new behaviour that scale is set up during examine.
author
Carl Hetherington
<cth@carlh.net>
Wed, 19 Nov 2014 17:08:14 +0000
(17:08 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 19 Nov 2014 17:08:14 +0000
(17:08 +0000)
test/black_fill_test.cc
patch
|
blob
|
history
diff --git
a/test/black_fill_test.cc
b/test/black_fill_test.cc
index 148ec9738c74329c9c126506488fac020ff41037..5981552d128e6c3f9f0ead28bacfc772ee2fd718 100644
(file)
--- a/
test/black_fill_test.cc
+++ b/
test/black_fill_test.cc
@@
-38,16
+38,16
@@
BOOST_AUTO_TEST_CASE (black_fill_test)
film->set_container (Ratio::from_id ("185"));
film->set_sequence_video (false);
shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
film->set_container (Ratio::from_id ("185"));
film->set_sequence_video (false);
shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
- contentA->set_scale (VideoContentScale (Ratio::from_id ("185")));
shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
- contentB->set_scale (VideoContentScale (Ratio::from_id ("185")));
film->examine_and_add_content (contentA);
film->examine_and_add_content (contentB);
wait_for_jobs ();
film->examine_and_add_content (contentA);
film->examine_and_add_content (contentB);
wait_for_jobs ();
+ contentA->set_scale (VideoContentScale (Ratio::from_id ("185")));
contentA->set_video_length (ContentTime::from_frames (3, 24));
contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
contentA->set_video_length (ContentTime::from_frames (3, 24));
contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
+ contentB->set_scale (VideoContentScale (Ratio::from_id ("185")));
contentB->set_video_length (ContentTime::from_frames (1, 24));
contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));
contentB->set_video_length (ContentTime::from_frames (1, 24));
contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));