#include <dcp/dcp.h>
#include <dcp/cpl.h>
#include <dcp/reel.h>
-#include <dcp/j2k.h>
+#include <dcp/j2k_transcode.h>
#include <dcp/mono_picture_asset.h>
#include <dcp/mono_picture_asset_reader.h>
#include <dcp/mono_picture_frame.h>
content->subtitle->set_burn (true);
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film);
check_dcp ("test/data/burnt_subtitle_test_subrip", film->dir (film->dcp_name ()));
}
content->subtitle->set_use (true);
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film);
check_dcp ("test/data/burnt_subtitle_test_dcp", film->dir (film->dcp_name ()));
}
film->set_name ("frobozz");
film->examine_and_add_content (content_factory(film, "test/data/flat_black.png").front());
BOOST_REQUIRE (!wait_for_jobs());
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film);
Config::instance()->set_log_types (Config::instance()->log_types() | LogEntry::TYPE_DEBUG_ENCODE);
auto film2 = new_test_film ("burnt_subtitle_test_onto_dcp2");
sub->subtitle->set_outline (true);
film2->examine_and_add_content (sub);
BOOST_REQUIRE (!wait_for_jobs());
- film2->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film2);
BOOST_CHECK (background_dcp->position() == DCPTime());
BOOST_CHECK (sub->position() == DCPTime());