Add VideoFrame class.

[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 737bc883c62486b36f40516f27d77b66850e2d68..2d783f52d72ae357d033ab70847902d98903333b 100644 (file)
--- a/test/video_decoder_fill_test.cc
+++ b/test/video_decoder_fill_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1)
        BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 4U);
        list<ContentVideo>::iterator i = decoder.video->_decoded.begin();
        for (int j = 0; j < 4; ++j) {
-               BOOST_CHECK_EQUAL (i->frame, j);
+               BOOST_CHECK_EQUAL (i->frame.index(), j);
                ++i;
        }
 
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1)
        BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 7);
        i = decoder.video->_decoded.begin();
        for (int j = 0; j < 7; ++j) {
-               BOOST_CHECK_EQUAL (i->frame, j);
+               BOOST_CHECK_EQUAL (i->frame.index(), j);
                ++i;
        }
 }
@@ -62,32 +62,32 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test2)
        shared_ptr<ImageContent> c (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
        ImageDecoder decoder (c, film->log());
 
-       decoder.video->fill_both_eyes (0, EYES_LEFT, 4, EYES_LEFT);
+       decoder.video->fill_both_eyes (VideoFrame (0, EYES_LEFT), VideoFrame (4, EYES_LEFT));
        BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 8);
        list<ContentVideo>::iterator i = decoder.video->_decoded.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);
+               BOOST_CHECK_EQUAL (i->frame.index(), j / 2);
+               BOOST_CHECK_EQUAL (i->frame.eyes(), (j % 2) == 0 ? EYES_LEFT : EYES_RIGHT);
                ++i;
        }
 
        decoder.video->_decoded.clear ();
-       decoder.video->fill_both_eyes (0, EYES_LEFT, 7, EYES_RIGHT);
+       decoder.video->fill_both_eyes (VideoFrame (0, EYES_LEFT), VideoFrame (7, EYES_RIGHT));
        BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 15);
        i = decoder.video->_decoded.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);
+               BOOST_CHECK_EQUAL (i->frame.index(), j / 2);
+               BOOST_CHECK_EQUAL (i->frame.eyes(), (j % 2) == 0 ? EYES_LEFT : EYES_RIGHT);
                ++i;
        }
 
        decoder.video->_decoded.clear ();
-       decoder.video->fill_both_eyes (0, EYES_RIGHT, 7, EYES_RIGHT);
+       decoder.video->fill_both_eyes (VideoFrame (0, EYES_RIGHT), VideoFrame (7, EYES_RIGHT));
        BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 14);
        i = decoder.video->_decoded.begin();
        for (int j = 0; j < 14; ++j) {
-               BOOST_CHECK_EQUAL (i->frame, (j + 1) / 2);
-               BOOST_CHECK_EQUAL (i->eyes, (j % 2) == 0 ? EYES_RIGHT : EYES_LEFT);
+               BOOST_CHECK_EQUAL (i->frame.index(), (j + 1) / 2);
+               BOOST_CHECK_EQUAL (i->frame.eyes(), (j % 2) == 0 ? EYES_RIGHT : EYES_LEFT);
                ++i;
        }
 }