X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fscaling_test.cc;h=9a3424506c0c5dae589cc406e9c1733884c0ad8d;hb=25eb7aa723af004162fc7f95995df250c4e4571b;hp=ed0461005f12376ba00e1b13fef07c3edd83c573;hpb=308fb04d15cecb471c8c04db40d2979810efefe3;p=dcpomatic.git

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index ed0461005..9a3424506 100644
--- 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,38 @@
 
 */
 
+
 /** @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/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 ();
-
-	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,30 +65,31 @@ 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 (film, "test/data/simple_testcard_640x480.png"));
+	auto imc = make_shared<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");
 }