X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvideo_content_scale_test.cc;h=8c3bd431acd20536c3fc3fa3b94789ca3a8923cd;hb=f26af8112b03b5233eb5239defd11a7428b705ad;hp=a2fb7fd434c400e27a374cced22cb72bcd80167a;hpb=f2416324fdaef8d75678da751446113fbe19de8a;p=dcpomatic.git
diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc
index a2fb7fd43..8c3bd431a 100644
--- a/test/video_content_scale_test.cc
+++ b/test/video_content_scale_test.cc
@@ -49,6 +49,7 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop
"23.97602462768555"
"0"
"1"
+ "12"
"" << crop.left << ""
"" << crop.right << ""
"" << crop.top << ""
@@ -97,7 +98,7 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop
sc = VideoContentScale (scale);
}
- dcp::Size answer = sc.get().size (vc, display_size, film_size, 1);
+ dcp::Size answer = sc.get().size (vc, display_size, film_size);
if (answer != correct) {
cerr << "Testing " << vc->video_size().width << "x" << vc->video_size().height << "\n";
cerr << "Testing " << display_size.width << "x" << display_size.height << "\n";
@@ -105,7 +106,7 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop
}
BOOST_CHECK (answer == correct);
}
-
+
/* Test scale and stretch to specified ratio */
BOOST_AUTO_TEST_CASE (video_content_scale_test_to_ratio)
{
@@ -132,7 +133,7 @@ BOOST_AUTO_TEST_CASE (video_content_scale_test_to_ratio)
true,
dcp::Size (1998, 837)
);
-
+
// Flat in scope container
test (
dcp::Size (400, 200),
@@ -144,7 +145,7 @@ BOOST_AUTO_TEST_CASE (video_content_scale_test_to_ratio)
dcp::Size (1587, 858)
);
-
+
/* To player */
// Flat in flat container
@@ -168,7 +169,7 @@ BOOST_AUTO_TEST_CASE (video_content_scale_test_to_ratio)
true,
dcp::Size (185, 78)
);
-
+
// Flat in scope container
test (
dcp::Size (400, 200),