projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New cdist can run a specific test.
[dcpomatic.git]
/
test
/
ffmpeg_decoder_sequential_test.cc
diff --git
a/test/ffmpeg_decoder_sequential_test.cc
b/test/ffmpeg_decoder_sequential_test.cc
index e4968dedaaaa787e2f35a32605cb48fbc773485f..7435a4af04d334bbd356a1c54405c603d18d53fb 100644
(file)
--- a/
test/ffmpeg_decoder_sequential_test.cc
+++ b/
test/ffmpeg_decoder_sequential_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014 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/>.
*/
*/
@@
-22,13
+23,16
@@
* (dropped frames being checked by assert() in VideoDecoder). Also that the decoder picks up frame rates correctly.
*/
* (dropped frames being checked by assert() in VideoDecoder). Also that the decoder picks up frame rates correctly.
*/
-#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/content_video.h"
+#include "lib/video_decoder.h"
#include "lib/film.h"
#include "test.h"
#include "lib/film.h"
#include "test.h"
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+#include <iostream>
using std::cout;
using std::cerr;
using std::cout;
using std::cerr;
@@
-36,8
+40,8
@@
using std::list;
using boost::shared_ptr;
using boost::optional;
using boost::shared_ptr;
using boost::optional;
-
static
void
-
test (boost::filesystem::path file, float fps, int gaps
)
+void
+
ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length
)
{
boost::filesystem::path path = private_data / file;
if (!boost::filesystem::exists (path)) {
{
boost::filesystem::path path = private_data / file;
if (!boost::filesystem::exists (path)) {
@@
-46,36
+50,35
@@
test (boost::filesystem::path file, float fps, int gaps)
}
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, false));
+
+ BOOST_REQUIRE (decoder->video->_content->video_frame_rate());
+ BOOST_CHECK_CLOSE (decoder->video->_content->video_frame_rate().get(), fps, 0.01);
- BOOST_CHECK_CLOSE (decoder.video_content()->video_frame_rate(), fps, 0.01);
-
- VideoFrame const N = decoder.video_content()->video_length().frames (decoder.video_content()->video_frame_rate ());
-#ifdef DCPOMATIC_DEBUG
- decoder.test_gaps = 0;
-#endif
- for (VideoFrame i = 0; i < N; ++i) {
+#ifdef DCPOMATIC_DEBUG
+ decoder->video->test_gaps = 0;
+#endif
+ for (Frame i = 0; i < video_length; ++i) {
list<ContentVideo> v;
list<ContentVideo> v;
- v = decoder
.get_video
(i, true);
- BOOST_
CHECK (v.size() == 1
);
+ v = decoder
->video->get
(i, true);
+ BOOST_
REQUIRE_EQUAL (v.size(), 1U
);
BOOST_CHECK_EQUAL (v.front().frame, i);
}
BOOST_CHECK_EQUAL (v.front().frame, i);
}
-#ifdef DCPOMATIC_DEBUG
- BOOST_CHECK_EQUAL (decoder
.
test_gaps, gaps);
+#ifdef DCPOMATIC_DEBUG
+ BOOST_CHECK_EQUAL (decoder
->video->
test_gaps, gaps);
#endif
}
BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
{
#endif
}
BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
{
-
test ("boon_telly.mkv", 29.97,
0);
-
test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 0
);
+
ffmpeg_decoder_sequential_test_one ("boon_telly.mkv", 29.97, 0, 691
0);
+
ffmpeg_decoder_sequential_test_one ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 0, 1248
);
/* The first video frame is 12 here, so VideoDecoder should see 12 gaps
(at the start of the file)
*/
/* The first video frame is 12 here, so VideoDecoder should see 12 gaps
(at the start of the file)
*/
-
test ("prophet_clip.mkv", 23.976, 12
);
+
ffmpeg_decoder_sequential_test_one ("prophet_clip.mkv", 23.976, 12, 2875
);
}
}
-