projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split up Config::read().
[dcpomatic.git]
/
test
/
ffmpeg_dcp_test.cc
diff --git
a/test/ffmpeg_dcp_test.cc
b/test/ffmpeg_dcp_test.cc
index 797af8736989015e19528b5e8dc9f2de303ed7d4..0d56f4290fd1788db1e655773717e5274df96e71 100644
(file)
--- a/
test/ffmpeg_dcp_test.cc
+++ b/
test/ffmpeg_dcp_test.cc
@@
-1,28
+1,32
@@
/*
/*
- Copyright (C) 2012-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
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/>.
*/
*/
+
/** @file test/ffmpeg_dcp_test.cc
* @brief Test creation of a very simple DCP from some FFmpegContent (data/test.mp4).
/** @file test/ffmpeg_dcp_test.cc
* @brief Test creation of a very simple DCP from some FFmpegContent (data/test.mp4).
+ * @ingroup feature
*
* Also a quick test of Film::have_dcp ().
*/
*
* Also a quick test of Film::have_dcp ().
*/
+
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@@
-30,39
+34,41
@@
#include "lib/ffmpeg_content.h"
#include "lib/ratio.h"
#include "lib/dcp_content_type.h"
#include "lib/ffmpeg_content.h"
#include "lib/ratio.h"
#include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
#include "test.h"
#include "test.h"
-using boost::shared_ptr;
+
+using std::make_shared;
+using std::shared_ptr;
+
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
{
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
{
-
shared_ptr<Film>
film = new_test_film ("ffmpeg_dcp_test");
+
auto
film = new_test_film ("ffmpeg_dcp_test");
film->set_name ("test_film2");
film->set_name ("test_film2");
-
shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4")
);
+
auto c = make_shared<FFmpegContent>("test/data/test.mp4"
);
film->examine_and_add_content (c);
film->examine_and_add_content (c);
- wait_for_jobs ();
-
- c->set_scale (VideoContentScale (Ratio::from_id ("185")));
-
+ BOOST_REQUIRE (!wait_for_jobs());
+
film->set_container (Ratio::from_id ("185"));
film->set_container (Ratio::from_id ("185"));
- film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
- film->make_dcp ();
- film->write_metadata ();
+ film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+ make_and_verify_dcp (film);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
}
}
-/** Briefly test Film::cpls(). Requires the output from ffmpeg_dcp_test above */
-BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
+
+/** Briefly test Film::cpls() */
+BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test, * boost::unit_test::depends_on("ffmpeg_dcp_test"))
{
{
-
boost::filesystem::path
p = test_film_dir ("ffmpeg_dcp_test");
-
shared_ptr<Film> film (new Film (p.string ())
);
+
auto
p = test_film_dir ("ffmpeg_dcp_test");
+
auto film = make_shared<Film>(p
);
film->read_metadata ();
BOOST_CHECK (!film->cpls().empty());
p /= film->dcp_name();
film->read_metadata ();
BOOST_CHECK (!film->cpls().empty());
p /= film->dcp_name();
-
boost::filesystem::directory_iterator
i = boost::filesystem::directory_iterator (p);
+
auto
i = boost::filesystem::directory_iterator (p);
while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) {
++i;
}
while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) {
++i;
}
@@
-70,6
+76,6
@@
BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
if (i != boost::filesystem::directory_iterator ()) {
boost::filesystem::remove (i->path ());
}
if (i != boost::filesystem::directory_iterator ()) {
boost::filesystem::remove (i->path ());
}
-
+
BOOST_CHECK (film->cpls().empty());
}
BOOST_CHECK (film->cpls().empty());
}