Fix errors when a custom size is given which is larger than the container (#2404).

[dcpomatic.git] / test / scaling_test.cc

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 93c994741f50e4926993ed8e4b2c7fe84396ea35..11b8ae1b744587c50cbe4842e73600c45308d51f 100644 (file)
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,30 +18,39 @@
 
 */
 
+
 /** @file test/scaling_test.cc
  *  @brief Test scaling and black-padding of images from a still-image source.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
-#include <boost/test/unit_test.hpp>
+
+#include "lib/content_factory.h"
+#include "lib/dcp_content_type.h"
+#include "lib/film.h"
 #include "lib/image_content.h"
 #include "lib/ratio.h"
-#include "lib/film.h"
-#include "lib/dcp_content_type.h"
 #include "lib/video_content.h"
 #include "test.h"
+#include <boost/test/unit_test.hpp>
+
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
 
-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 ();
-
-       BOOST_REQUIRE (!wait_for_jobs());
+       make_and_verify_dcp (
+               film,
+               {
+                       dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE,
+                       dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+               });
 
        boost::filesystem::path ref;
        ref = "test";
@@ -57,12 +66,13 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content
        check_dcp (ref.string(), check.string());
 }
 
+
 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"));
+       auto 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("test/data/simple_testcard_640x480.png"));
+       auto imc = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 
        film->examine_and_add_content (imc);
 
@@ -71,16 +81,34 @@ BOOST_AUTO_TEST_CASE (scaling_test)
        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");
 }
+
+
+BOOST_AUTO_TEST_CASE(assertion_failure_when_scaling)
+{
+       auto content = content_factory("test/data/flat_red.png");
+       auto film = new_test_film2("assertion_failure_when_scaling", content);
+
+       content[0]->video->set_custom_size(dcp::Size{3996, 2180});
+       film->set_resolution(Resolution::FOUR_K);
+
+       make_and_verify_dcp (
+               film,
+               {
+                       dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE,
+                       dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+               });
+}
+