Remove video_decoder_fill_test as it was specialised to the old code.

diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc
deleted file mode 100644 (file)
index 2d783f5..0000000
--- a/test/video_decoder_fill_test.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
-
-    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.
-
-    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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#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>
-
-using std::list;
-using std::cout;
-using boost::shared_ptr;
-
-BOOST_AUTO_TEST_CASE (video_decoder_fill_test1)
-{
-       shared_ptr<Film> film = new_test_film ("video_decoder_fill_test");
-       shared_ptr<ImageContent> c (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
-       ImageDecoder decoder (c, film->log());
-
-       decoder.video->fill_one_eye (0, 4, EYES_BOTH);
-       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.index(), j);
-               ++i;
-       }
-
-       decoder.video->_decoded.clear ();
-
-       decoder.video->fill_one_eye (0, 7, EYES_BOTH);
-       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.index(), j);
-               ++i;
-       }
-}
-
-BOOST_AUTO_TEST_CASE (video_decoder_fill_test2)
-{
-       shared_ptr<Film> film = new_test_film ("video_decoder_fill_test");
-       shared_ptr<ImageContent> c (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
-       ImageDecoder decoder (c, film->log());
-
-       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.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_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.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;
-       }
-}

diff --git a/test/wscript b/test/wscript
index 0f3ef4cde5bc15f1be1eb8286aec0626713daf19..85a573f0cc25987f1607b0c6ea4ccb5be6e02b17 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -106,7 +106,6 @@ def build(bld):
 
     # XXX
     # upmixer_a_test.cc
-    # video_decoder_fill_test.cc
 
     obj.target = 'unit-tests'
     obj.install_path = ''