projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split audio; builds.
[dcpomatic.git]
/
test
/
scaling_test.cc
diff --git
a/test/scaling_test.cc
b/test/scaling_test.cc
index 5e8dab3085171b49389476ab749ec97c1f2e3d82..25359c605dd779f8c73c659793d93fdeb6be11b5 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,24
@@
*/
*/
+/** @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 <boost/test/unit_test.hpp>
-#include "lib/image
magick
_content.h"
+#include "lib/image_content.h"
#include "lib/ratio.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
#include "test.h"
#include "test.h"
-/** @file test/scaling_test.cc
- * @brief Test scaling and black-padding of images from a still-image source.
- */
-
using std::string;
using boost::shared_ptr;
using std::string;
using boost::shared_ptr;
-static void scaling_test_for (shared_ptr<Film> film, shared_ptr<
Video
Content> content, string image, string container)
+static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content, string image, string container)
{
{
- content->
set_ratio (Ratio::from_id (image
));
+ content->
video->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 ();
@@
-56,22
+57,27
@@
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);
wait_for_jobs ();
film->examine_and_add_content (imc);
wait_for_jobs ();
-
- imc->set_video_length (1);
+ imc->video->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");
}
-