projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in previous.
[dcpomatic.git]
/
test
/
ffmpeg_dcp_test.cc
diff --git
a/test/ffmpeg_dcp_test.cc
b/test/ffmpeg_dcp_test.cc
index 1aa41967abe502c2772d94267db9d410cc42cb07..78847e40b9450464dc8bea3924051e79774fa4f3 100644
(file)
--- a/
test/ffmpeg_dcp_test.cc
+++ b/
test/ffmpeg_dcp_test.cc
@@
-1,24
+1,26
@@
/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-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/>.
*/
/** @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 specific
*
* Also a quick test of Film::have_dcp ().
*/
*
* Also a quick test of Film::have_dcp ().
*/
@@
-30,6
+32,7
@@
#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"
using boost::shared_ptr;
#include "test.h"
using boost::shared_ptr;
@@
-38,30
+41,30
@@
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
{
shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
film->set_name ("test_film2");
{
shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
film->set_name ("test_film2");
- shared_ptr<FFmpegContent> c (new FFmpegContent
(film,
"test/data/test.mp4"));
+ shared_ptr<FFmpegContent> c (new 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()
);
+
+ c->
video->
set_scale (VideoContentScale (Ratio::from_id ("185")));
+
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->set_dcp_content_type (DCPContentType::from_
isdcf_name ("TST
"));
film->make_dcp ();
film->write_metadata ();
film->make_dcp ();
film->write_metadata ();
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
}
/** Briefly test Film::cpls(). Requires the output from ffmpeg_dcp_test above */
}
/** Briefly test Film::cpls(). Requires the output from ffmpeg_dcp_test above */
-BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
+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");
{
boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
- shared_ptr<Film> f
(new Film (p.string ()
));
- f->read_metadata ();
- BOOST_CHECK (!f->cpls().empty());
+ shared_ptr<Film> f
ilm (new Film (p
));
+ f
ilm
->read_metadata ();
+ BOOST_CHECK (!f
ilm
->cpls().empty());
- p /= f->dcp_name();
+ p /= f
ilm
->dcp_name();
boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (p);
while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) {
++i;
boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (p);
while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) {
++i;
@@
-70,6
+73,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 (f->cpls().empty());
+
+ BOOST_CHECK (f
ilm
->cpls().empty());
}
}