X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fvideo_decoder_fill_test.cc;h=8aa5e830fd36ee5f21351642efedd17e990c5bbe;hp=9ee00450d15f58537c455409b2b6d3caa3da6b47;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hpb=b18134cd8dcd5c3ae877283fd43d20251939813f

diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc
index 9ee00450d..8aa5e830f 100644
--- a/test/video_decoder_fill_test.cc
+++ b/test/video_decoder_fill_test.cc
@@ -1,52 +1,59 @@
 /*
-    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
+    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/>.
 
 */
 
-#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 <boost/test/unit_test.hpp>
+#include <boost/make_shared.hpp>
+#include <iostream>
 
 using std::list;
 using std::cout;
 using boost::shared_ptr;
+using boost::make_shared;
 
 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);
+	shared_ptr<ImageContent> c = make_shared<ImageContent> (film, "test/data/simple_testcard_640x480.png");
+	ImageDecoder decoder (c, film->log());
 
-	decoder.fill_2d (0, 4);
-	BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 4);
-	list<ContentVideo>::iterator i = decoder._decoded_video.begin();	
+	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, j);
+		BOOST_CHECK_EQUAL (i->frame.index(), j);
 		++i;
 	}
 
-	decoder._decoded_video.clear ();
+	decoder.video->_decoded.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.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;
 	}
 }
@@ -54,24 +61,35 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1)
 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);
+	shared_ptr<ImageContent> c = make_shared<ImageContent> (film, "test/data/simple_testcard_640x480.png");
+	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 (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.fill_3d (0, 7, EYES_RIGHT);
-	BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 15);
-	i = decoder._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;
 	}
 }