Change video content scaling so that it either:

[dcpomatic.git] / test / scaling_test.cc

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 13276977d891912ad98a03a40a3fa5873a6f35a1..dd3b6118ecf6eea8a76acd870d84c9788185a0bd 100644 (file)
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -34,13 +34,14 @@
 using std::string;
 using boost::shared_ptr;
 
-static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content, string image, string container)
+static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content, float ratio, std::string image, string container)
 {
-       content->video->set_scale (VideoContentScale (Ratio::from_id (image)));
+       content->video->set_custom_ratio (ratio);
        film->set_container (Ratio::from_id (container));
+       film->set_interop (false);
        film->make_dcp ();
 
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        boost::filesystem::path ref;
        ref = "test";
@@ -61,25 +62,25 @@ BOOST_AUTO_TEST_CASE (scaling_test)
        shared_ptr<Film> film = new_test_film ("scaling_test");
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        film->set_name ("scaling_test");
-       shared_ptr<ImageContent> imc (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
+       shared_ptr<ImageContent> imc (new ImageContent("test/data/simple_testcard_640x480.png"));
 
        film->examine_and_add_content (imc);
 
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        imc->video->set_length (1);
 
        /* F-133: 133 image in a flat container */
-       scaling_test_for (film, imc, "133", "185");
+       scaling_test_for (film, imc, 4.0 / 3, "133", "185");
        /* F: flat image in a flat container */
-       scaling_test_for (film, imc, "185", "185");
+       scaling_test_for (film, imc, 1.85, "185", "185");
        /* F-S: scope image in a flat container */
-       scaling_test_for (film, imc, "239", "185");
+       scaling_test_for (film, imc, 2.38695, "239", "185");
 
        /* S-133: 133 image in a scope container */
-       scaling_test_for (film, imc, "133", "239");
+       scaling_test_for (film, imc, 4.0 / 3, "133", "239");
        /* S-F: flat image in a scope container */
-       scaling_test_for (film, imc, "185", "239");
+       scaling_test_for (film, imc, 1.85, "185", "239");
        /* S: scope image in a scope container */
-       scaling_test_for (film, imc, "239", "239");
+       scaling_test_for (film, imc, 2.38695, "239", "239");
 }