diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-10 14:29:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 504c63b3d62038bc486ca8a09e77fbb403907edd (patch) | |
| tree | d9118c185110dd9eb103ed033700d4b3f486785d /test/video_decoder_fill_test.cc | |
| parent | 9423e02c37daba7f9e406929a1cfc1bb10fb4b62 (diff) | |
Basics of splitting up Decoder tree like Content.
Diffstat (limited to 'test/video_decoder_fill_test.cc')
| -rw-r--r-- | test/video_decoder_fill_test.cc | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc index 190a469d0..539392718 100644 --- a/test/video_decoder_fill_test.cc +++ b/test/video_decoder_fill_test.cc @@ -20,6 +20,8 @@ #include <boost/test/unit_test.hpp> #include "lib/image_decoder.h" #include "lib/image_content.h" +#include "lib/content_video.h" +#include "lib/video_decoder.h" #include "lib/film.h" #include "test.h" #include <iostream> @@ -34,19 +36,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, film->log()); - decoder.fill_one_eye (0, 4, EYES_BOTH); - BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 4U); - list<ContentVideo>::iterator i = decoder._decoded_video.begin(); + decoder.video->fill_one_eye (0, 4, EYES_BOTH); + BOOST_CHECK_EQUAL (decoder.video->_decoded_video.size(), 4U); + list<ContentVideo>::iterator i = decoder.video->_decoded_video.begin(); for (int j = 0; j < 4; ++j) { BOOST_CHECK_EQUAL (i->frame, j); ++i; } - decoder._decoded_video.clear (); + decoder.video->_decoded_video.clear (); - decoder.fill_one_eye (0, 7, EYES_BOTH); - BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 7); - i = decoder._decoded_video.begin(); + decoder.video->fill_one_eye (0, 7, EYES_BOTH); + BOOST_CHECK_EQUAL (decoder.video->_decoded_video.size(), 7); + i = decoder.video->_decoded_video.begin(); for (int j = 0; j < 7; ++j) { BOOST_CHECK_EQUAL (i->frame, j); ++i; @@ -59,18 +61,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, film->log()); - decoder.fill_both_eyes (0, 4, EYES_LEFT); - BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 8); - list<ContentVideo>::iterator i = decoder._decoded_video.begin(); + decoder.video->fill_both_eyes (0, 4, EYES_LEFT); + BOOST_CHECK_EQUAL (decoder.video->_decoded_video.size(), 8); + list<ContentVideo>::iterator i = decoder.video->_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_both_eyes (0, 7, EYES_RIGHT); - BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 15); - i = decoder._decoded_video.begin(); + decoder.video->fill_both_eyes (0, 7, EYES_RIGHT); + BOOST_CHECK_EQUAL (decoder.video->_decoded_video.size(), 15); + i = decoder.video->_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); |