diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-14 11:48:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-14 11:48:37 +0100 |
| commit | 4b7b0edb359ae68f2dbcab90c7c10382f507fa5b (patch) | |
| tree | 2cf52d224651f1f0fb1b4fd0d542acf8b77835eb /test/video_decoder_fill_test.cc | |
| parent | 3d6501346b187f35d0f55d16e13f8817f505a82f (diff) | |
Add VideoFrame class.
This puts a frame index with an Eyes, which simplifies code in
some areas. I can't think of a better name for it,
unfortunately.
Diffstat (limited to 'test/video_decoder_fill_test.cc')
| -rw-r--r-- | test/video_decoder_fill_test.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc index 737bc883c..2d783f52d 100644 --- 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; } } |