Shell of KDM GUI tool.

[dcpomatic.git] / test / video_content_scale_test.cc

diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc
index a2fb7fd434c400e27a374cced22cb72bcd80167a..8c3bd431acd20536c3fc3fa3b94789ca3a8923cd 100644 (file)
--- 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
                "<OriginalVideoFrameRate>23.97602462768555</OriginalVideoFrameRate>"
                "<VideoFrameType>0</VideoFrameType>"
                "<SampleAspectRatio>1</SampleAspectRatio>"
+               "<BitsPerPixel>12</BitsPerPixel>"
                "<LeftCrop>" << crop.left << "</LeftCrop>"
                "<RightCrop>" << crop.right << "</RightCrop>"
                "<TopCrop>" << crop.top << "</TopCrop>"
@@ -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),