projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
test
/
ffmpeg_examiner_test.cc
diff --git
a/test/ffmpeg_examiner_test.cc
b/test/ffmpeg_examiner_test.cc
index a3b9bb4f6506793186b1aff886f68f67c07d6662..d72226a6f68a173ed8e53ae4b788acdf438049e4 100644
(file)
--- a/
test/ffmpeg_examiner_test.cc
+++ b/
test/ffmpeg_examiner_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,6
+17,11
@@
*/
*/
+/** @file test/ffmpeg_examiner_test.cc
+ * @brief Check that the FFmpegExaminer can extract the first video and audio time
+ * correctly from data/count300bd24.m2ts.
+ */
+
#include <boost/test/unit_test.hpp>
#include "lib/ffmpeg_examiner.h"
#include "lib/ffmpeg_content.h"
#include <boost/test/unit_test.hpp>
#include "lib/ffmpeg_examiner.h"
#include "lib/ffmpeg_content.h"
@@
-30,7
+35,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test)
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd24.m2ts"));
shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (content));
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd24.m2ts"));
shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (content));
- BOOST_CHECK_EQUAL (examiner->first_video().get(),
600
);
+ BOOST_CHECK_EQUAL (examiner->first_video().get(),
ContentTime::from_seconds (600)
);
BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1);
BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1);
- BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get(),
600
);
+ BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get(),
ContentTime::from_seconds (600)
);
}
}