projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some tests.
[dcpomatic.git]
/
test
/
scaling_test.cc
diff --git
a/test/scaling_test.cc
b/test/scaling_test.cc
index 5ac5c7525cbb581704bd024439c00d6eea6a4172..c361da80bb2f66053516ad79daf0a1390b8b186d 100644
(file)
--- a/
test/scaling_test.cc
+++ b/
test/scaling_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,10
+18,13
@@
*/
*/
+
/** @file test/scaling_test.cc
* @brief Test scaling and black-padding of images from a still-image source.
/** @file test/scaling_test.cc
* @brief Test scaling and black-padding of images from a still-image source.
+ * @ingroup feature
*/
*/
+
#include <boost/test/unit_test.hpp>
#include "lib/image_content.h"
#include "lib/ratio.h"
#include <boost/test/unit_test.hpp>
#include "lib/image_content.h"
#include "lib/ratio.h"
@@
-30,16
+33,23
@@
#include "lib/video_content.h"
#include "test.h"
#include "lib/video_content.h"
#include "test.h"
+
using std::string;
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_container (Ratio::from_id (container));
- film->make_dcp ();
-
- wait_for_jobs ();
+ film->set_interop (false);
+ 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";
boost::filesystem::path ref;
ref = "test";
@@
-55,30
+65,31
@@
static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content
check_dcp (ref.string(), check.string());
}
check_dcp (ref.string(), check.string());
}
+
BOOST_AUTO_TEST_CASE (scaling_test)
{
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");
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);
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 */
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 */
/* 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 */
/* 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 */
/* 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 */
/* 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 */
/* S: scope image in a scope container */
- scaling_test_for (film, imc, "239", "239");
+ scaling_test_for (film, imc,
2.38695,
"239", "239");
}
}