X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fscaling_test.cc;h=b6b38e1260e58ec4f98385a1f2f788c623eb842b;hb=40893c977cda14d9a9b46613697bc68aad08eccf;hp=d642271c27088bb39254e0bc6a1031e4e51d5541;hpb=c008066160d85b9ec9e5485375d7baaa5d27bda2;p=dcpomatic.git diff --git a/test/scaling_test.cc b/test/scaling_test.cc index d642271c2..b6b38e126 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -60,18 +60,24 @@ BOOST_AUTO_TEST_CASE (scaling_test) film->set_name ("scaling_test"); shared_ptr imc (new ImageContent (film, "test/data/simple_testcard_640x480.png")); - film->examine_and_add_content (imc, true); + film->examine_and_add_content (imc); wait_for_jobs (); - - imc->set_video_length (ContentTime::from_frames (1, 24)); + imc->set_video_length (1); + + /* F-133: 133 image in a flat container */ scaling_test_for (film, imc, "133", "185"); + /* F: flat image in a flat container */ scaling_test_for (film, imc, "185", "185"); + /* F-S: scope image in a flat container */ scaling_test_for (film, imc, "239", "185"); + /* S-133: 133 image in a scope container */ scaling_test_for (film, imc, "133", "239"); + /* S-F: flat image in a scope container */ scaling_test_for (film, imc, "185", "239"); + /* S: scope image in a scope container */ scaling_test_for (film, imc, "239", "239"); }