diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-19 17:08:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-19 17:08:14 +0000 |
| commit | d2bf589a0f7057c14cb656513f6477f68a7939f3 (patch) | |
| tree | cca420acbcbf6aeb00305d1bf1f02c38d4f5ff94 | |
| parent | 475d5986b7ba3796eb0aa93ec0b536f45e15b0a5 (diff) | |
Fix test for new behaviour that scale is set up during examine.
| -rw-r--r-- | test/black_fill_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc index 148ec9738..5981552d1 100644 --- 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")); - contentA->set_scale (VideoContentScale (Ratio::from_id ("185"))); 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 (); + 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 ())); + 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 ())); |