Basics of splitting up Decoder tree like Content.

[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 25f7548535e8b793869e3b4a1687310d02c3bd58..53939271833460d256d54a6ff82779ab1221f229 100644 (file)
--- a/test/video_decoder_fill_test.cc
+++ b/test/video_decoder_fill_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,7 +20,11 @@
 #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;
@@ -30,21 +34,21 @@ 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);
+       ImageDecoder decoder (c, film->log());
 
-       decoder.fill_2d (0, 4);
-       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_2d (0, 7);
-       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;
@@ -55,20 +59,20 @@ 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);
+       ImageDecoder decoder (c, film->log());
 
-       decoder.fill_3d (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_3d (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);