projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporter.
[dcpomatic.git]
/
test
/
ffmpeg_decoder_seek_test.cc
diff --git
a/test/ffmpeg_decoder_seek_test.cc
b/test/ffmpeg_decoder_seek_test.cc
index 2a9b4da715ed35ef2cab298f8b654a2759911157..0e5b2963f89d60e6a004654413fb1acc8b87f546 100644
(file)
--- a/
test/ffmpeg_decoder_seek_test.cc
+++ b/
test/ffmpeg_decoder_seek_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2015 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/>.
*/
*/
@@
-29,6
+30,8
@@
#include "lib/ffmpeg_decoder.h"
#include "lib/null_log.h"
#include "lib/film.h"
#include "lib/ffmpeg_decoder.h"
#include "lib/null_log.h"
#include "lib/film.h"
+#include "lib/content_video.h"
+#include "lib/video_decoder.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
@@
-44,9
+47,9
@@
static void
check (shared_ptr<FFmpegDecoder> decoder, int frame)
{
list<ContentVideo> v;
check (shared_ptr<FFmpegDecoder> decoder, int frame)
{
list<ContentVideo> v;
- v = decoder->
get_video
(frame, true);
+ v = decoder->
video->get
(frame, true);
BOOST_CHECK (v.size() == 1);
BOOST_CHECK (v.size() == 1);
- BOOST_CHECK_EQUAL (v.front().frame, frame);
+ BOOST_CHECK_EQUAL (v.front().frame
.index()
, frame);
}
static void
}
static void
@@
-63,7
+66,7
@@
test (boost::filesystem::path file, vector<int> frames)
film->examine_and_add_content (content);
wait_for_jobs ();
shared_ptr<Log> log (new NullLog);
film->examine_and_add_content (content);
wait_for_jobs ();
shared_ptr<Log> log (new NullLog);
- shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log
, false
));
+ shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log));
for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
check (decoder, *i);
for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
check (decoder, *i);