X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fvideo_decoder_fill_test.cc;h=85dafd93ff8bb0099c870691786dd029f86d29b7;hb=ad7dc5ef0bd6f70c32600329e135d87b84604a3f;hp=ae54759031bea9d6b181d106a258a2f0c1d600a7;hpb=2f6c8ade1f0cf6fce69542ff7cce3b2b2c5774d9;p=dcpomatic.git

diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc
index ae5475903..85dafd93f 100644
--- a/test/video_decoder_fill_test.cc
+++ b/test/video_decoder_fill_test.cc
@@ -32,15 +32,17 @@ 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);
-	BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 4);
+	decoder.fill_2d (0, 4);
+	BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 4U);
 	list<ContentVideo>::iterator i = decoder._decoded_video.begin();	
 	for (int j = 0; j < 4; ++j) {
 		BOOST_CHECK_EQUAL (i->frame, j);
 		++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) {