using std::cout;
using std::exception;
using std::map;
+using std::set;
using std::vector;
using boost::shared_ptr;
using boost::optional;
list<ReferencedReelAsset> const & refs,
list<shared_ptr<Font> > const& fonts,
int64_t duration,
- boost::filesystem::path output_dcp
+ boost::filesystem::path output_dcp,
+ bool ensure_subtitles,
+ set<DCPTextTrack> ensure_closed_captions
) const
{
shared_ptr<dcp::ReelSubtitleAsset> subtitle = maybe_add_text<dcp::ReelSubtitleAsset> (
_subtitle_asset, duration, reel, refs, fonts, film(), _period, output_dcp, _text_only
);
- if (subtitle && !film()->subtitle_languages().empty()) {
- subtitle->set_language (film()->subtitle_languages().front());
+
+ if (subtitle) {
+ /* We have a subtitle asset that we either made or are referencing */
+ if (!film()->subtitle_languages().empty()) {
+ subtitle->set_language (film()->subtitle_languages().front());
+ }
+ } else if (ensure_subtitles) {
+ /* We had no subtitle asset, but we've been asked to make sure there is one */
+ subtitle = maybe_add_text<dcp::ReelSubtitleAsset>(
+ empty_text_asset(TEXT_OPEN_SUBTITLE, optional<DCPTextTrack>()),
+ duration,
+ reel,
+ refs,
+ fonts,
+ film(),
+ _period,
+ output_dcp,
+ _text_only
+ );
}
for (map<DCPTextTrack, shared_ptr<dcp::SubtitleAsset> >::const_iterator i = _closed_caption_assets.begin(); i != _closed_caption_assets.end(); ++i) {
shared_ptr<dcp::ReelClosedCaptionAsset> a = maybe_add_text<dcp::ReelClosedCaptionAsset> (
i->second, duration, reel, refs, fonts, film(), _period, output_dcp, _text_only
);
- if (a) {
- a->set_annotation_text (i->first.name);
- if (!i->first.language.empty()) {
- a->set_language (dcp::LanguageTag(i->first.language));
- }
+ DCPOMATIC_ASSERT (a);
+ a->set_annotation_text (i->first.name);
+ if (!i->first.language.empty()) {
+ a->set_language (dcp::LanguageTag(i->first.language));
+ }
+
+ ensure_closed_captions.erase (i->first);
+ }
+
+ /* Make empty tracks for anything we've been asked to ensure but that we haven't added */
+ BOOST_FOREACH (DCPTextTrack i, ensure_closed_captions) {
+ shared_ptr<dcp::ReelClosedCaptionAsset> a = maybe_add_text<dcp::ReelClosedCaptionAsset> (
+ empty_text_asset(TEXT_CLOSED_CAPTION, i), duration, reel, refs, fonts, film(), _period, output_dcp, _text_only
+ );
+ DCPOMATIC_ASSERT (a);
+ a->set_annotation_text (i.name);
+ if (!i.language.empty()) {
+ a->set_language (dcp::LanguageTag(i.language));
}
}
}
}
+/** @param ensure_subtitles true to make sure the reel has a subtitle asset.
+ * @param ensure_closed_captions make sure the reel has these closed caption tracks.
+ */
shared_ptr<dcp::Reel>
-ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr<Font> > const & fonts, boost::filesystem::path output_dcp)
+ReelWriter::create_reel (
+ list<ReferencedReelAsset> const & refs,
+ list<shared_ptr<Font> > const & fonts,
+ boost::filesystem::path output_dcp,
+ bool ensure_subtitles,
+ set<DCPTextTrack> ensure_closed_captions
+ )
{
LOG_GENERAL ("create_reel for %1-%2; %3 of %4", _period.from.get(), _period.to.get(), _reel_index, _reel_count);
create_reel_markers (reel);
}
- create_reel_text (reel, refs, fonts, duration, output_dcp);
+ create_reel_text (reel, refs, fonts, duration, output_dcp, ensure_subtitles, ensure_closed_captions);
if (_atmos_asset) {
reel->add (shared_ptr<dcp::ReelAtmosAsset>(new dcp::ReelAtmosAsset(_atmos_asset, 0)));
void finish (boost::filesystem::path output_dcp);
boost::shared_ptr<dcp::Reel> create_reel (
- std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<dcpomatic::Font> > const & fonts, boost::filesystem::path output_dcp
+ std::list<ReferencedReelAsset> const & refs,
+ std::list<boost::shared_ptr<dcpomatic::Font> > const & fonts,
+ boost::filesystem::path output_dcp,
+ bool ensure_subtitles,
+ std::set<DCPTextTrack> ensure_closed_captions
);
void calculate_digests (boost::function<void (float)> set_progress);
boost::shared_ptr<dcp::Reel> reel,
std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<dcpomatic::Font> > const& fonts,
int64_t duration,
- boost::filesystem::path output_dcp
+ boost::filesystem::path output_dcp,
+ bool ensure_subtitles,
+ std::set<DCPTextTrack> ensure_closed_captions
) const;
void create_reel_markers (boost::shared_ptr<dcp::Reel> reel) const;
, _repeat_written (0)
, _pushed_to_disk (0)
, _text_only (text_only)
+ , _have_subtitles (false)
{
shared_ptr<Job> job = _job.lock ();
/* Add reels */
BOOST_FOREACH (ReelWriter& i, _reels) {
- cpl->add (i.create_reel(_reel_assets, _fonts, output_dcp));
+ cpl->add (i.create_reel(_reel_assets, _fonts, output_dcp, _have_subtitles, _have_closed_captions));
}
/* Add metadata */
switch (type) {
case TEXT_OPEN_SUBTITLE:
reel = &_subtitle_reel;
+ _have_subtitles = true;
break;
case TEXT_CLOSED_CAPTION:
DCPOMATIC_ASSERT (track);
DCPOMATIC_ASSERT (_caption_reels.find(*track) != _caption_reels.end());
reel = &_caption_reels[*track];
+ _have_closed_captions.insert (*track);
break;
default:
DCPOMATIC_ASSERT (false);
std::list<ReferencedReelAsset> _reel_assets;
std::list<boost::shared_ptr<dcpomatic::Font> > _fonts;
+
+ /** true if any reel has any subtitles */
+ bool _have_subtitles;
+ /** all closed caption tracks that we have on any reel */
+ std::set<DCPTextTrack> _have_closed_captions;
};
/*
- Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2019-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+#include "lib/content_factory.h"
#include "lib/film.h"
#include "lib/image_content.h"
#include "lib/dcp_subtitle_content.h"
+#include "lib/text_content.h"
#include "lib/video_content.h"
#include "test.h"
#include <dcp/dcp.h>
#include <dcp/cpl.h>
#include <dcp/reel.h>
#include <dcp/interop_subtitle_asset.h>
+#include <dcp/reel_closed_caption_asset.h>
#include <dcp/reel_subtitle_asset.h>
+#include <boost/foreach.hpp>
#include <boost/test/unit_test.hpp>
+
using std::list;
+using std::string;
+using boost::optional;
using boost::shared_ptr;
+
/* Check that timings are done correctly for multi-reel DCPs with PNG subs */
BOOST_AUTO_TEST_CASE (subtitle_reel_test)
{
/* These times should be the same as they are should be offset from the start of the reel */
BOOST_CHECK (A->subtitles().front()->in() == B->subtitles().front()->in());
}
+
+
+
+/** Check that with a SMPTE DCP if we have subtitles in one reel, all reels have a
+ * SubtitleAsset (even if it's empty); SMPTE Bv2.1 section 8.3.1.
+ */
+BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test)
+{
+ shared_ptr<Film> film = new_test_film2 ("subtitle_in_all_reels_test");
+ film->set_interop (false);
+ film->set_sequence (false);
+ film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+ for (int i = 0; i < 3; ++i) {
+ shared_ptr<Content> video = content_factory("test/data/flat_red.png").front();
+ film->examine_and_add_content (video);
+ BOOST_REQUIRE (!wait_for_jobs());
+ video->video->set_length (15 * 24);
+ video->set_position (film, dcpomatic::DCPTime::from_seconds(15 * i));
+ }
+ shared_ptr<Content> subs = content_factory("test/data/15s.srt").front();
+ film->examine_and_add_content (subs);
+ BOOST_REQUIRE (!wait_for_jobs());
+ film->make_dcp ();
+ BOOST_REQUIRE (!wait_for_jobs());
+
+ dcp::DCP dcp ("build/test/subtitle_in_all_reels_test/" + film->dcp_name());
+ dcp.read ();
+ BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
+ shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
+ BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3);
+
+ BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
+ BOOST_CHECK (i->main_subtitle());
+ }
+}
+
+
+/** Check that with a SMPTE DCP if we have closed captions in one reel, all reels have a
+ * ClosedCaptionAssets for the same set of tracks (even if they are empty); SMPTE Bv2.1 section 8.3.1.
+ */
+BOOST_AUTO_TEST_CASE (closed_captions_in_all_reels_test)
+{
+ shared_ptr<Film> film = new_test_film2 ("closed_captions_in_all_reels_test");
+ film->set_interop (false);
+ film->set_sequence (false);
+ film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+
+ for (int i = 0; i < 3; ++i) {
+ shared_ptr<Content> video = content_factory("test/data/flat_red.png").front();
+ film->examine_and_add_content (video);
+ BOOST_REQUIRE (!wait_for_jobs());
+ video->video->set_length (15 * 24);
+ video->set_position (film, dcpomatic::DCPTime::from_seconds(15 * i));
+ }
+
+ shared_ptr<Content> ccap1 = content_factory("test/data/15s.srt").front();
+ film->examine_and_add_content (ccap1);
+ BOOST_REQUIRE (!wait_for_jobs());
+ ccap1->text.front()->set_type (TEXT_CLOSED_CAPTION);
+ ccap1->text.front()->set_dcp_track (DCPTextTrack("Test", "de-DE"));
+
+ shared_ptr<Content> ccap2 = content_factory("test/data/15s.srt").front();
+ film->examine_and_add_content (ccap2);
+ BOOST_REQUIRE (!wait_for_jobs());
+ ccap2->text.front()->set_type (TEXT_CLOSED_CAPTION);
+ ccap2->text.front()->set_dcp_track (DCPTextTrack("Other", "en-GB"));
+
+ film->make_dcp ();
+ BOOST_REQUIRE (!wait_for_jobs());
+
+ dcp::DCP dcp ("build/test/closed_captions_in_all_reels_test/" + film->dcp_name());
+ dcp.read ();
+ BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
+ shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
+ BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3);
+
+ BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
+ BOOST_REQUIRE_EQUAL (i->closed_captions().size(), 2);
+ optional<string> first = i->closed_captions().front()->language();
+ optional<string> second = i->closed_captions().back()->language();
+ BOOST_REQUIRE (first);
+ BOOST_REQUIRE (second);
+ BOOST_CHECK (
+ (*first == "en-GB" && *second == "de-DE") ||
+ (*first == "de-DE" && *second == "en-GB")
+ );
+ }
+}