projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[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 67e84b7137863c5803a2f6d9f171ef8c677f77ae..da23b277558ba284d0a086f78d39a4105286610b 100644
(file)
--- a/
test/video_decoder_fill_test.cc
+++ b/
test/video_decoder_fill_test.cc
@@
-1,25
+1,29
@@
/*
/*
- 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.
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
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 <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>
#include "test.h"
#include <iostream>
@@
-31,21
+35,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"));
{
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_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
.size(), 4U);
+ list<ContentVideo>::iterator i = decoder.
video->_decoded
.begin();
for (int j = 0; j < 4; ++j) {
BOOST_CHECK_EQUAL (i->frame, j);
++i;
}
for (int j = 0; j < 4; ++j) {
BOOST_CHECK_EQUAL (i->frame, j);
++i;
}
- decoder.
_decoded_video
.clear ();
+ decoder.
video->_decoded
.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
.size(), 7);
+ i = decoder.
video->_decoded
.begin();
for (int j = 0; j < 7; ++j) {
BOOST_CHECK_EQUAL (i->frame, j);
++i;
for (int j = 0; j < 7; ++j) {
BOOST_CHECK_EQUAL (i->frame, j);
++i;
@@
-56,20
+60,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"));
{
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_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
.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);
++i;
}
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
.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);
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);