/*
Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
ImageDecoder decoder (c, film->log());
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();
+ 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;
}
- decoder.video->_decoded_video.clear ();
+ decoder.video->_decoded.clear ();
decoder.video->fill_one_eye (0, 7, EYES_BOTH);
- BOOST_CHECK_EQUAL (decoder.video->_decoded_video.size(), 7);
- i = decoder.video->_decoded_video.begin();
+ 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;
}
}
shared_ptr<ImageContent> c (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
ImageDecoder decoder (c, film->log());
- 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();
+ 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->fill_both_eyes (0, 7, EYES_RIGHT);
- BOOST_CHECK_EQUAL (decoder.video->_decoded_video.size(), 15);
- i = decoder.video->_decoded_video.begin();
+ decoder.video->_decoded.clear ();
+ 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 (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.index(), (j + 1) / 2);
+ BOOST_CHECK_EQUAL (i->frame.eyes(), (j % 2) == 0 ? EYES_RIGHT : EYES_LEFT);
++i;
}
}