X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvideo_decoder_fill_test.cc;h=6d75e30da26c9c6b772af450f72148a71d57d59b;hb=b0afedfb0b2fbdeb2fa63c593609027bc6b7e050;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..6d75e30da 100644
--- a/test/video_decoder_fill_test.cc
+++ b/test/video_decoder_fill_test.cc
@@ -32,17 +32,19 @@ 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);
-	list<ContentVideo>::iterator i = decoder._decoded_video.begin();	
+	decoder.fill_one_eye (0, 4, EYES_BOTH);
+	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_one_eye (0, 7, EYES_BOTH);
 	BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 7);
-	i = decoder._decoded_video.begin();	
+	i = decoder._decoded_video.begin();
 	for (int j = 0; j < 7; ++j) {
 		BOOST_CHECK_EQUAL (i->frame, j);
 		++i;
@@ -55,18 +57,18 @@ 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_both_eyes (0, 4, EYES_LEFT);
 	BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 8);
-	list<ContentVideo>::iterator i = decoder._decoded_video.begin();	
+	list<ContentVideo>::iterator i = decoder._decoded_video.begin();
 	for (int j = 0; j < 8; ++j) {
 		BOOST_CHECK_EQUAL (i->frame, j / 2);
 		BOOST_CHECK_EQUAL (i->eyes, (j % 2) == 0 ? EYES_LEFT : EYES_RIGHT);
 		++i;
 	}
 
-	decoder.fill_up_to_3d (7, EYES_RIGHT);
+	decoder.fill_both_eyes (0, 7, EYES_RIGHT);
 	BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 15);
-	i = decoder._decoded_video.begin();	
+	i = decoder._decoded_video.begin();
 	for (int j = 0; j < 15; ++j) {
 		BOOST_CHECK_EQUAL (i->frame, j / 2);
 		BOOST_CHECK_EQUAL (i->eyes, (j % 2) == 0 ? EYES_LEFT : EYES_RIGHT);