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 3274fd8a907054a477665b24ce616d4a2180d6f5..0e5b2963f89d60e6a004654413fb1acc8b87f546 100644
(file)
--- a/
test/ffmpeg_decoder_seek_test.cc
+++ b/
test/ffmpeg_decoder_seek_test.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2014 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/>.
*/
*/
@@
-25,14
+26,16
@@
* it probably should.
*/
* it probably should.
*/
-#include <vector>
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_decoder.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_decoder.h"
-#include "lib/log.h"
+#include "lib/
null_
log.h"
#include "lib/film.h"
#include "lib/film.h"
+#include "lib/content_video.h"
+#include "lib/video_decoder.h"
#include "test.h"
#include "test.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
using std::cerr;
using std::vector;
using std::cerr;
using std::vector;
@@
-41,12
+44,12
@@
using boost::shared_ptr;
using boost::optional;
static void
using boost::optional;
static void
-check (
FFmpegDecoder&
decoder, int frame)
+check (
shared_ptr<FFmpegDecoder>
decoder, int frame)
{
list<ContentVideo> v;
{
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
@@
-59,11
+62,11
@@
test (boost::filesystem::path file, vector<int> frames)
}
shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
}
shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
- shared_ptr<FFmpegContent> content (new FFmpegContent (film, path));
- film->examine_and_add_content (content
, true
);
+ shared_ptr<FFmpegContent> content (new FFmpegContent (film, path));
+ film->examine_and_add_content (content);
wait_for_jobs ();
shared_ptr<Log> log (new NullLog);
wait_for_jobs ();
shared_ptr<Log> log (new NullLog);
-
FFmpegDecoder decoder (content, log
);
+
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);
@@
-73,7
+76,7
@@
test (boost::filesystem::path file, vector<int> frames)
BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
{
vector<int> frames;
BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
{
vector<int> frames;
-
+
frames.clear ();
frames.push_back (0);
frames.push_back (42);
frames.clear ();
frames.push_back (0);
frames.push_back (42);
@@
-82,13
+85,12
@@
BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
test ("boon_telly.mkv", frames);
test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", frames);
test ("boon_telly.mkv", frames);
test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", frames);
-
+
frames.clear ();
frames.push_back (15);
frames.push_back (42);
frames.push_back (999);
frames.push_back (15);
frames.clear ();
frames.push_back (15);
frames.push_back (42);
frames.push_back (999);
frames.push_back (15);
-
+
test ("prophet_clip.mkv", frames);
}
test ("prophet_clip.mkv", frames);
}
-