projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix or remove several broken pixel formats in Image::fade and add
[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 eb9ab568cdab883119aec8889c59c4d360e67030..399796698dc646c0dc2a1d60e92717d83e2a5f73 100644
(file)
--- a/
test/remake_with_subtitle_test.cc
+++ b/
test/remake_with_subtitle_test.cc
@@
-20,7
+20,7
@@
#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>
@@
-28,20
+28,25
@@
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::shared_ptr;
using boost::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)
{
shared_ptr<Film> film = new_test_film2 ("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());
+ shared_ptr<FFmpegContent> content = dynamic_pointer_cast<FFmpegContent>(content_factory(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);
+ content->
only_text()
->set_burn (true);
+ content->
only_text()
->set_use (true);
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs ());
boost::filesystem::remove_all (film->dir (film->dcp_name(), false));
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs ());
boost::filesystem::remove_all (film->dir (film->dcp_name(), false));
- content->
subtitle
->set_use (false);
+ content->
only_text()
->set_use (false);
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs ());
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs ());
+
+ check_one_frame (film->dir(film->dcp_name()), 325, private_data / "prophet_frame_325_no_subs.j2c");
}
}