Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.

1 files changed, 42 insertions, 1 deletions

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 60009f10b..dba611043 100644
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -17,15 +17,56 @@
 
 */
 
+#include "imagemagick_content.h"
+
 /** @file test/scaling_test.cc
  *  @brief Test scaling and black-padding of images from a still-image source.
  */
 
 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));
+	film->set_container (Ratio::from_id (container));
+	film->make_dcp ();
+
+	while (JobManager::instance()->work_to_do ());
+
+	BOOST_CHECK (!JobManager::instance()->errors());
+
+	boost::filesystem::path ref;
+	ref = "test";
+	ref /= "data";
+	ref /= "scaling_test_" + image + "_" + container;
+
+	boost::filesystem::path check;
+	check = "build";
+	check /= "test";
+	check /= "scaling_test";
+	check /= film->dcp_name();
+
+	check_dcp (ref.string(), check.string());
+}
+
 BOOST_AUTO_TEST_CASE (scaling_test)
 {
 	shared_ptr<Film> film = new_test_film ("scaling_test");
-	film->examine_and_add_content (shared_ptr<Content> (new ImageMagickContent ("test/data/simple_testcard_640x480.png")));
+	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_name ("scaling_test");
+	shared_ptr<ImageMagickContent> imc (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png"));
+
+	film->examine_and_add_content (imc);
+	while (JobManager::instance()->work_to_do ());
 	
+	imc->set_video_length (1);
+
+	scaling_test_for (film, imc, "133", "185");
+	scaling_test_for (film, imc, "185", "185");
+	scaling_test_for (film, imc, "239", "185");
+
+	scaling_test_for (film, imc, "133", "239");
+	scaling_test_for (film, imc, "185", "239");
+	scaling_test_for (film, imc, "239", "239");
 }
+