Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / test / video_decoder_fill_test.cc

diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc
index ae54759031bea9d6b181d106a258a2f0c1d600a7..9ee00450d15f58537c455409b2b6d3caa3da6b47 100644 (file)
--- a/test/video_decoder_fill_test.cc
+++ b/test/video_decoder_fill_test.cc
@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1)
        shared_ptr<ImageContent> c (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
        ImageDecoder decoder (c);
 
-       decoder.fill_up_to_2d (4);
+       decoder.fill_2d (0, 4);
        BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 4);
        list<ContentVideo>::iterator i = decoder._decoded_video.begin();        
        for (int j = 0; j < 4; ++j) {
@@ -40,7 +40,9 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1)
                ++i;
        }
 
-       decoder.fill_up_to_2d (7);
+       decoder._decoded_video.clear ();
+
+       decoder.fill_2d (0, 7);
        BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 7);
        i = decoder._decoded_video.begin();     
        for (int j = 0; j < 7; ++j) {
@@ -55,7 +57,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test2)
        shared_ptr<ImageContent> c (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
        ImageDecoder decoder (c);
 
-       decoder.fill_up_to_3d (4, EYES_LEFT);
+       decoder.fill_3d (0, 4, EYES_LEFT);
        BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 8);
        list<ContentVideo>::iterator i = decoder._decoded_video.begin();        
        for (int j = 0; j < 8; ++j) {
@@ -64,7 +66,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test2)
                ++i;
        }
 
-       decoder.fill_up_to_3d (7, EYES_RIGHT);
+       decoder.fill_3d (0, 7, EYES_RIGHT);
        BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 15);
        i = decoder._decoded_video.begin();     
        for (int j = 0; j < 15; ++j) {