projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 and general tidying.
[dcpomatic.git]
/
test
/
remake_with_subtitle_test.cc
diff --git
a/test/remake_with_subtitle_test.cc
b/test/remake_with_subtitle_test.cc
index 0190e9837c0f4150c12500d288aead3bbee7eb7b..3b6cf930c8a71bb87fbc8b6dcf84ff281aa80bd8 100644
(file)
--- a/
test/remake_with_subtitle_test.cc
+++ b/
test/remake_with_subtitle_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2017
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,33
+18,36
@@
*/
*/
+
#include "lib/ffmpeg_content.h"
#include "lib/content_factory.h"
#include "lib/ffmpeg_content.h"
#include "lib/content_factory.h"
-#include "lib/
subtitle
_content.h"
+#include "lib/
text
_content.h"
#include "lib/film.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
#include "lib/film.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
+
+
+/** Check that if we remake a DCP having turned off subtitles the code notices
+ * and doesn't re-use the old video data.
+ */
BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
{
BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
{
-
shared_ptr<Film>
film = new_test_film2 ("remake_with_subtitle_test");
-
shared_ptr<FFmpegContent> content = dynamic_pointer_cast<FFmpegContent>(content_factory(film, private_data
/ "prophet_short_clip.mkv").front());
+
auto
film = new_test_film2 ("remake_with_subtitle_test");
+
auto content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data()
/ "prophet_short_clip.mkv").front());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
- content->subtitle->set_burn (true);
- content->subtitle->set_use (true);
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs ());
+ content->only_text()->set_burn (true);
+ content->only_text()->set_use (true);
+ make_and_verify_dcp (film);
boost::filesystem::remove_all (film->dir (film->dcp_name(), false));
boost::filesystem::remove_all (film->dir (film->dcp_name(), false));
- content->subtitle->set_use (false);
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs ());
+ content->only_text()->set_use (false);
+ make_and_verify_dcp (film);
- /* Nothing is being checked here so this test is not complete */
- DCPOMATIC_ASSERT (false);
+ check_one_frame (film->dir(film->dcp_name()), 325, TestPaths::private_data() / "prophet_frame_325_no_subs.j2c");
}
}