projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make analog.py cope with another date/time format.
[dcpomatic.git]
/
test
/
scaling_test.cc
diff --git
a/test/scaling_test.cc
b/test/scaling_test.cc
index dba611043793d1c53713929bd008133ec35346bd..b6b38e1260e58ec4f98385a1f2f788c623eb842b 100644
(file)
--- a/
test/scaling_test.cc
+++ b/
test/scaling_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,23
+17,27
@@
*/
*/
-#include "imagemagick_content.h"
-
/** @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.
*/
+#include <boost/test/unit_test.hpp>
+#include "lib/image_content.h"
+#include "lib/ratio.h"
+#include "lib/film.h"
+#include "lib/dcp_content_type.h"
+#include "test.h"
+
+using std::string;
using boost::shared_ptr;
static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> content, string image, string container)
{
using boost::shared_ptr;
static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> content, string image, string container)
{
- content->set_
ratio (Ratio::from_id (image
));
+ content->set_
scale (VideoContentScale (Ratio::from_id (image)
));
film->set_container (Ratio::from_id (container));
film->make_dcp ();
film->set_container (Ratio::from_id (container));
film->make_dcp ();
- while (JobManager::instance()->work_to_do ());
-
- BOOST_CHECK (!JobManager::instance()->errors());
+ wait_for_jobs ();
boost::filesystem::path ref;
ref = "test";
boost::filesystem::path ref;
ref = "test";
@@
-52,21
+56,28
@@
static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> co
BOOST_AUTO_TEST_CASE (scaling_test)
{
shared_ptr<Film> film = new_test_film ("scaling_test");
BOOST_AUTO_TEST_CASE (scaling_test)
{
shared_ptr<Film> film = new_test_film ("scaling_test");
- film->set_dcp_content_type (DCPContentType::from_
dci
_name ("FTR"));
+ film->set_dcp_content_type (DCPContentType::from_
isdcf
_name ("FTR"));
film->set_name ("scaling_test");
film->set_name ("scaling_test");
- shared_ptr<Image
MagickContent> imc (new ImageMagick
Content (film, "test/data/simple_testcard_640x480.png"));
+ shared_ptr<Image
Content> imc (new Image
Content (film, "test/data/simple_testcard_640x480.png"));
film->examine_and_add_content (imc);
film->examine_and_add_content (imc);
- while (JobManager::instance()->work_to_do ());
-
+
+ wait_for_jobs ();
+
imc->set_video_length (1);
imc->set_video_length (1);
+ /* F-133: 133 image in a flat container */
scaling_test_for (film, imc, "133", "185");
scaling_test_for (film, imc, "133", "185");
+ /* F: flat image in a flat container */
scaling_test_for (film, imc, "185", "185");
scaling_test_for (film, imc, "185", "185");
+ /* F-S: scope image in a flat container */
scaling_test_for (film, imc, "239", "185");
scaling_test_for (film, imc, "239", "185");
+ /* S-133: 133 image in a scope container */
scaling_test_for (film, imc, "133", "239");
scaling_test_for (film, imc, "133", "239");
+ /* S-F: flat image in a scope container */
scaling_test_for (film, imc, "185", "239");
scaling_test_for (film, imc, "185", "239");
+ /* S: scope image in a scope container */
scaling_test_for (film, imc, "239", "239");
}
scaling_test_for (film, imc, "239", "239");
}